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

chrome/browser/android/provider/chrome_browser_provider.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/android/provider/chrome_browser_provider.h"
 
+#include <cmath>
 #include <list>
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
@@ skipping 659 matching lines @@
                         CancelableRequestConsumer* cancelable_consumer,
                         base::CancelableTaskTracker* cancelable_tracker)
       : FaviconServiceTask(favicon_service,
                            profile,
                            cancelable_consumer,
                            cancelable_tracker) {}
 
   favicon_base::FaviconRawBitmapResult Run(const GURL& url) {
     float max_scale = ui::GetScaleForScaleFactor(
         ResourceBundle::GetSharedInstance().GetMaxScaleFactor());
+    int desired_size_in_pixel = std::ceil(gfx::kFaviconSize * max_scale);
     RunAsyncRequestOnUIThreadBlocking(
         base::Bind(&FaviconService::GetRawFaviconForPageURL,
                    base::Unretained(service()),
-                   FaviconService::FaviconForPageURLParams(
-                       url,
-                       favicon_base::FAVICON | favicon_base::TOUCH_ICON,
-                       gfx::kFaviconSize),
-                   max_scale,
+                   url,
+                   favicon_base::FAVICON | favicon_base::TOUCH_ICON,
+                   desired_size_in_pixel,
                    base::Bind(&BookmarkIconFetchTask::OnFaviconRetrieved,
                               base::Unretained(this)),
                    cancelable_tracker()));
     return result_;
   }
 
  private:
   void OnFaviconRetrieved(
       const favicon_base::FaviconRawBitmapResult& bitmap_result) {
     result_ = bitmap_result;
@@ skipping 926 matching lines @@
     Java_ChromeBrowserProvider_onBookmarkChanged(env, obj.obj());
   } else if (type ==
       chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) {
     JNIEnv* env = AttachCurrentThread();
     ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env);
     if (obj.is_null())
       return;
     Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj());
   }
 }