Replace content's faviconURL with components/favicon's

chrome/browser/favicon/favicon_tab_helper.cc

 // Copyright (c) 2012 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 "chrome/browser/favicon/favicon_tab_helper.h"
 
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/url_constants.h"
 #include "components/bookmarks/core/browser/bookmark_model.h"
+#include "components/favicon_base/favicon_types.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
+#include "content/public/common/favicon_url.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_rep.h"
 
 using content::FaviconStatus;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
@@ skipping 177 matching lines @@
 }
 
 void FaviconTabHelper::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   favicon_urls_.clear();
   // Get the favicon, either from history or request it from the net.
   FetchFavicon(details.entry->GetURL());
 }
 
+// Returns favicon_base::IconType the given icon_type corresponds to.
+favicon_base::IconType ToChromeIconType(

[blundell, 2014/05/16 07:33:30]

This conversion function seems like it would make would more sense as a static
function in //components/favicon_base/content, something like
|FaviconBaseIconTypeFromContentIconType|. WDYT?

[jif, 2014/05/16 17:32:30]

I agree.
Added TODO.

+    content::FaviconURL::IconType icon_type) {
+  switch (icon_type) {
+    case content::FaviconURL::FAVICON:
+      return favicon_base::FAVICON;
+    case content::FaviconURL::TOUCH_ICON:
+      return favicon_base::TOUCH_ICON;
+    case content::FaviconURL::TOUCH_PRECOMPOSED_ICON:
+      return favicon_base::TOUCH_PRECOMPOSED_ICON;
+    case content::FaviconURL::INVALID_ICON:
+      return favicon_base::INVALID_ICON;
+  }
+  NOTREACHED();
+  return favicon_base::INVALID_ICON;
+}
+
 void FaviconTabHelper::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
   DCHECK(!candidates.empty());
   favicon_urls_ = candidates;
-
-  favicon_handler_->OnUpdateFaviconURL(candidates);
+  std::vector<favicon::FaviconURL> favicon_urls;
+  for (size_t i = 0; i < candidates.size(); i++) {
+    const content::FaviconURL& candidate = candidates[i];
+    favicon_urls.push_back(
+        favicon::FaviconURL(candidate.icon_url,
+                            ToChromeIconType(candidate.icon_type),
+                            candidate.icon_sizes));
+  }
+  favicon_handler_->OnUpdateFaviconURL(favicon_urls);
   if (touch_icon_handler_.get())
-    touch_icon_handler_->OnUpdateFaviconURL(candidates);
+    touch_icon_handler_->OnUpdateFaviconURL(favicon_urls);
 }
 
 FaviconService* FaviconTabHelper::GetFaviconService() {
   return FaviconServiceFactory::GetForProfile(profile_,
                                               Profile::EXPLICIT_ACCESS);
 }
 
 bool FaviconTabHelper::IsBookmarked(const GURL& url) {
   BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_);
   return bookmark_model && bookmark_model->IsBookmarked(url);
@@ skipping 14 matching lines @@
       favicon_service->UnableToDownloadFavicon(image_url);
   }
 
   favicon_handler_->OnDidDownloadFavicon(
       id, image_url, bitmaps, original_bitmap_sizes);
   if (touch_icon_handler_.get()) {
     touch_icon_handler_->OnDidDownloadFavicon(
         id, image_url, bitmaps, original_bitmap_sizes);
   }
 }