WebView: suppress deprecation warnings

supress deprecation warnings on ZoomButtonsController and
WebIconDatabase

BUG=755922

Change-Id: I7b0f6769127b45245652afcd53615d2f2fcde985
Reviewed-on: https://chromium-review.googlesource.com/682997
Reviewed-by: Paul Miller <paulmiller@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: James Wallace-Lee <jamwalla@chromium.org>
Cr-Commit-Position: refs/heads/master@{#504192}

android_webview/glue/java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java

@@ -5,16 +5,14 @@
 package com.android.webview.chromium;
 
 import android.content.ContentResolver;
-import android.webkit.WebIconDatabase;
-import android.webkit.WebIconDatabase.IconListener;
 
 import org.chromium.android_webview.AwContents;
 
 /**
  * Chromium implementation of WebIconDatabase -- big old no-op (base class is deprecated).
  */
 @SuppressWarnings("deprecation")
-final class WebIconDatabaseAdapter extends WebIconDatabase {
+final class WebIconDatabaseAdapter extends android.webkit.WebIconDatabase {
     @Override
     public void open(String path) {
         AwContents.setShouldDownloadFavicons();

android_webview/java/src/org/chromium/android_webview/AwZoomControls.java

@@ -9,34 +9,37 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
-import android.widget.ZoomButtonsController;
 
 class AwZoomControls {
 
     private AwContents mAwContents;
     // It is advised to use getZoomController() where possible.
-    private ZoomButtonsController mZoomButtonsController;
+    @SuppressWarnings("deprecation")
+    private android.widget.ZoomButtonsController mZoomButtonsController;
 
     AwZoomControls(AwContents awContents) {
         mAwContents = awContents;
     }
 
+    @SuppressWarnings("deprecation")
     public void invokeZoomPicker() {
-        ZoomButtonsController zoomController = getZoomController();
+        android.widget.ZoomButtonsController zoomController = getZoomController();
         if (zoomController != null) {
             zoomController.setVisible(true);
         }
     }
 
+    @SuppressWarnings("deprecation")
     public void dismissZoomPicker() {
-        ZoomButtonsController zoomController = getZoomController();
+        android.widget.ZoomButtonsController zoomController = getZoomController();
         if (zoomController != null) {
             zoomController.setVisible(false);
         }
     }
 
+    @SuppressWarnings("deprecation")
     public void updateZoomControls() {
-        ZoomButtonsController zoomController = getZoomController();
+        android.widget.ZoomButtonsController zoomController = getZoomController();
         if (zoomController == null) {
             return;
         }
@@ -58,10 +61,11 @@ View getZoomControlsViewForTest() {
     }
 
     @SuppressLint("RtlHardcoded")
-    private ZoomButtonsController getZoomController() {
+    @SuppressWarnings("deprecation")
+    private android.widget.ZoomButtonsController getZoomController() {
         if (mZoomButtonsController == null
                 && mAwContents.getSettings().shouldDisplayZoomControls()) {
-            mZoomButtonsController = new ZoomButtonsController(
+            mZoomButtonsController = new android.widget.ZoomButtonsController(
                     mAwContents.getContentViewCore().getContainerView());
             mZoomButtonsController.setOnZoomListener(new ZoomListener());
             // ZoomButtonsController positions the buttons at the bottom, but in
@@ -76,7 +80,8 @@ private ZoomButtonsController getZoomController() {
         return mZoomButtonsController;
     }
 
-    private class ZoomListener implements ZoomButtonsController.OnZoomListener {
+    @SuppressWarnings("deprecation")
+    private class ZoomListener implements android.widget.ZoomButtonsController.OnZoomListener {
         @Override
         public void onVisibilityChanged(boolean visible) {
             if (visible) {