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-Original-Commit-Position: refs/heads/master@{#504192}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 3b09d5a1ec7d5ee8685e8b3fedc5d259d23bd634
diff --git a/java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java b/java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java
index e382b74..f94849e 100644
--- a/java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java
+++ b/java/src/com/android/webview/chromium/WebIconDatabaseAdapter.java
@@ -5,8 +5,6 @@
 package com.android.webview.chromium;
 
 import android.content.ContentResolver;
-import android.webkit.WebIconDatabase;
-import android.webkit.WebIconDatabase.IconListener;
 
 import org.chromium.android_webview.AwContents;
 
@@ -14,7 +12,7 @@
  * 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();