[Refactor] Change FaviconService API to take in a desired pixel size

chrome/browser/bookmarks/chrome_bookmark_client.cc

 // Copyright 2014 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/bookmarks/chrome_bookmark_client.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 20 matching lines @@
 namespace {
 
 void NotifyHistoryOfRemovedURLs(Profile* profile,
                                 const std::set<GURL>& removed_urls) {
   HistoryService* history_service =
       HistoryServiceFactory::GetForProfile(profile, Profile::EXPLICIT_ACCESS);
   if (history_service)
     history_service->URLsNoLongerBookmarked(removed_urls);
 }
 
+void RunCallbackWithImage(
+    const favicon_base::FaviconImageCallback& callback,
+    const favicon_base::FaviconRawBitmapResult& bitmap_result) {
+  favicon_base::FaviconImageResult result;
+  if (bitmap_result.is_valid()) {
+    result.image = gfx::Image::CreateFrom1xPNGBytes(
+        bitmap_result.bitmap_data->front(), bitmap_result.bitmap_data->size());
+    result.icon_url = bitmap_result.icon_url;
+    callback.Run(result);
+    return;
+  }
+  callback.Run(result);
+}
+
 }  // namespace
 
 ChromeBookmarkClient::ChromeBookmarkClient(Profile* profile)
     : profile_(profile), model_(NULL), managed_node_(NULL) {
 }
 
 ChromeBookmarkClient::~ChromeBookmarkClient() {
 }
 
 void ChromeBookmarkClient::Init(BookmarkModel* model) {
@@ skipping 39 matching lines @@
 }
 
 bool ChromeBookmarkClient::PreferTouchIcon() {
 #if !defined(OS_IOS)
   return false;
 #else
   return true;
 #endif
 }
 
-base::CancelableTaskTracker::TaskId ChromeBookmarkClient::GetFaviconImageForURL(
+base::CancelableTaskTracker::TaskId
+ChromeBookmarkClient::GetFaviconImageForPageURL(
     const GURL& page_url,
-    int icon_types,
-    int desired_size_in_dip,
+    favicon_base::IconType type,
     const favicon_base::FaviconImageCallback& callback,
     base::CancelableTaskTracker* tracker) {
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!favicon_service)
     return base::CancelableTaskTracker::kBadTaskId;
-  return favicon_service->GetFaviconImageForPageURL(
-      FaviconService::FaviconForPageURLParams(
-          page_url, icon_types, desired_size_in_dip),
-      callback,
-      tracker);
+  if (type == favicon_base::FAVICON) {
+    return favicon_service->GetFaviconImageForPageURL(
+        page_url, callback, tracker);
+  } else {
+    return favicon_service->GetRawFaviconForPageURL(
+        page_url,
+        type,
+        0,
+        base::Bind(&RunCallbackWithImage, callback),
+        tracker);
+  }
 }
 
 bool ChromeBookmarkClient::SupportsTypedCountForNodes() {
   return true;
 }
 
 void ChromeBookmarkClient::GetTypedCountForNodes(
     const NodeSet& nodes,
     NodeTypedCountPairs* node_typed_count_pairs) {
   HistoryService* history_service =
@@ skipping 129 matching lines @@
   return extra_nodes.Pass();
 }
 
 std::string ChromeBookmarkClient::GetManagedBookmarksDomain() {
   policy::ProfilePolicyConnector* connector =
       policy::ProfilePolicyConnectorFactory::GetForProfile(profile_);
   if (connector->IsPolicyFromCloudPolicy(policy::key::kManagedBookmarks))
     return connector->GetManagementDomain();
   return std::string();
 }