Componentize conversion of content::FaviconURL to favicon::FaviconURL

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 "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/chrome_favicon_client.h"
 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"
 #include "chrome/browser/favicon/favicon_service_factory.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/favicon/content/favicon_url_util.h"
 #include "components/favicon/core/favicon_handler.h"
 #include "components/favicon/core/favicon_service.h"
 #include "components/favicon/core/favicon_tab_helper_observer.h"
 #include "components/favicon_base/favicon_types.h"
 #include "components/history/core/browser/history_service.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"
@@ skipping 248 matching lines @@
   // FaviconHandler has the time to determine that the favicon needs to be
   // redownloaded.
   GURL url = details.entry->GetURL();
   if (url != bypass_cache_page_url_)
     bypass_cache_page_url_ = GURL();
 
   // Get the favicon, either from history or request it from the net.
   FetchFavicon(url);
 }
 
-// Returns favicon_base::IconType the given icon_type corresponds to.
-// TODO(jif): Move function to /components/favicon_base/content/
-// crbug.com/374281.
-favicon_base::IconType ToChromeIconType(
-    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;
-  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));
-  }
+  std::vector<favicon::FaviconURL> favicon_urls =
+      favicon::FaviconURLsFromContentFaviconURLs(candidates);
   favicon_handler_->OnUpdateFaviconURL(favicon_urls);
   if (touch_icon_handler_.get())
     touch_icon_handler_->OnUpdateFaviconURL(favicon_urls);
   if (large_icon_handler_.get())
     large_icon_handler_->OnUpdateFaviconURL(favicon_urls);
 }
 
 void FaviconTabHelper::DidDownloadFavicon(
     int id,
     int http_status_code,
@@ skipping 13 matching lines @@
       id, image_url, bitmaps, original_bitmap_sizes);
   if (touch_icon_handler_.get()) {
     touch_icon_handler_->OnDidDownloadFavicon(
         id, image_url, bitmaps, original_bitmap_sizes);
   }
   if (large_icon_handler_.get()) {
     large_icon_handler_->OnDidDownloadFavicon(
         id, image_url, bitmaps, original_bitmap_sizes);
   }
 }