Move IconURLs method from WebFrame to WebLocalFrame

android_webview/browser/icon_helper.cc

Index: android_webview/browser/icon_helper.cc
diff --git a/android_webview/browser/icon_helper.cc b/android_webview/browser/icon_helper.cc
index c2b3162cad86cbcf5b8ea6a95cf46fc20c028cc3..e258f36b18e466d6100899edc8067be26a46b8fb 100644
--- a/android_webview/browser/icon_helper.cc
+++ b/android_webview/browser/icon_helper.cc
@@ -66,7 +66,7 @@ void IconHelper::DidUpdateFaviconURL(
       continue;
 
     switch(i->icon_type) {
-      case content::FaviconURL::FAVICON:
+      case content::FaviconURL::IconType::kFavicon:
         if ((listener_ && !listener_->ShouldDownloadFavicon(i->icon_url)) ||
             WasUnableToDownloadFavicon(i->icon_url)) {
           break;
@@ -78,15 +78,15 @@ void IconHelper::DidUpdateFaviconURL(
             base::Bind(
                 &IconHelper::DownloadFaviconCallback, base::Unretained(this)));
         break;
-      case content::FaviconURL::TOUCH_ICON:
+      case content::FaviconURL::IconType::kTouchIcon:
         if (listener_)
           listener_->OnReceivedTouchIconUrl(i->icon_url.spec(), false);
         break;
-      case content::FaviconURL::TOUCH_PRECOMPOSED_ICON:
+      case content::FaviconURL::IconType::kTouchPrecomposedIcon:
         if (listener_)
           listener_->OnReceivedTouchIconUrl(i->icon_url.spec(), true);
         break;
-      case content::FaviconURL::INVALID_ICON:
+      case content::FaviconURL::IconType::kInvalid:
         // Silently ignore it. Only trigger a callback on valid icons.
         break;
       default: