Move IconURLs method from WebFrame to WebLocalFrame

android_webview/browser/icon_helper.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/icon_helper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/hash.h"
 #include "base/logging.h"
@@ skipping 48 matching lines @@
 
 void IconHelper::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   for (std::vector<content::FaviconURL>::const_iterator i = candidates.begin();
        i != candidates.end(); ++i) {
     if (!i->icon_url.is_valid())
       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;
         }
         web_contents()->DownloadImage(i->icon_url,
             true,  // Is a favicon
             0,  // No maximum size
             false,  // Normal cache policy
             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:
         NOTREACHED();
         break;
     }
   }
 }
 
 void IconHelper::DidStartNavigationToPendingEntry(
@@ skipping 11 matching lines @@
 bool IconHelper::WasUnableToDownloadFavicon(const GURL& icon_url) const {
   MissingFaviconURLHash url_hash = base::Hash(icon_url.spec());
   return missing_favicon_urls_.find(url_hash) != missing_favicon_urls_.end();
 }
 
 void IconHelper::ClearUnableToDownloadFavicons() {
   missing_favicon_urls_.clear();
 }
 
 }  // namespace android_webview