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

components/bookmarks/browser/bookmark_model.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 "components/bookmarks/browser/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/bind.h"
@@ skipping 941 matching lines @@
 }
 
 void BookmarkModel::LoadFavicon(
     BookmarkNode* node,
     favicon_base::IconType icon_type) {
   if (node->is_folder())
     return;
 
   DCHECK(node->url().is_valid());
   node->set_favicon_state(BookmarkNode::LOADING_FAVICON);
-  base::CancelableTaskTracker::TaskId taskId = client_->GetFaviconImageForURL(
-      node->url(),
-      icon_type,
-      icon_type == favicon_base::FAVICON ? gfx::kFaviconSize : 0,
-      base::Bind(
-          &BookmarkModel::OnFaviconDataAvailable,
-          base::Unretained(this),
-          node,
-          icon_type),
-      &cancelable_task_tracker_);
-  if (taskId != base::CancelableTaskTracker::kBadTaskId)
-    node->set_favicon_load_task_id(taskId);
+  base::CancelableTaskTracker::TaskId task_id =
+      base::CancelableTaskTracker::kBadTaskId;
+  if (icon_type == favicon_base::FAVICON) {
+    task_id = client_->GetFaviconImageForPageURL(
+        node->url(),
+        base::Bind(
+            &BookmarkModel::OnFaviconDataAvailable,
+            base::Unretained(this),
+            node,
+            icon_type),
+        &cancelable_task_tracker_);
+  } else {
+    task_id = client_->GetTouchFaviconImageForPageURL(
+        node->url(),
+        base::Bind(
+            &BookmarkModel::OnFaviconDataAvailable,
+            base::Unretained(this),
+            node,
+            icon_type),
+        &cancelable_task_tracker_);
+  }
+  if (task_id != base::CancelableTaskTracker::kBadTaskId)
+    node->set_favicon_load_task_id(task_id);
 }
 
 void BookmarkModel::FaviconLoaded(const BookmarkNode* node) {
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     BookmarkNodeFaviconChanged(this, node));
 }
 
 void BookmarkModel::CancelPendingFaviconLoadRequests(BookmarkNode* node) {
   if (node->favicon_load_task_id() != base::CancelableTaskTracker::kBadTaskId) {
     cancelable_task_tracker_.TryCancel(node->favicon_load_task_id());
@@ skipping 23 matching lines @@
   BookmarkPermanentNode* mobile_node =
       CreatePermanentNode(BookmarkNode::MOBILE);
   return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails(
       bb_node,
       other_node,
       mobile_node,
       client_->GetLoadExtraNodesCallback(),
       new BookmarkIndex(client_, index_urls_, accept_languages),
       next_node_id_));
 }