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

chrome/browser/ui/webui/favicon_source.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/ui/webui/favicon_source.h"
 
+#include <cmath>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/browser/sync/open_tabs_ui_delegate.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
@@ skipping 53 matching lines @@
   }
 
   chrome::ParsedFaviconPath parsed;
   bool success = chrome::ParseFaviconPath(path, icon_types_, &parsed);
   if (!success) {
     SendDefaultResponse(callback);
     return;
   }
 
   GURL url(parsed.url);
+  int desired_size_in_pixel =
+      std::ceil(parsed.size_in_dip * parsed.device_scale_factor);
 
   if (parsed.is_icon_url) {
     // TODO(michaelbai): Change GetRawFavicon to support combination of
     // IconType.
-    favicon_service->GetRawFavicon(
+   favicon_service->GetRawFavicon(
         url,
         favicon_base::FAVICON,
-        parsed.size_in_dip,
-        parsed.device_scale_factor,
+        desired_size_in_pixel,
         base::Bind(
             &FaviconSource::OnFaviconDataAvailable,
             base::Unretained(this),
             IconRequest(
                 callback, url, parsed.size_in_dip, parsed.device_scale_factor)),
         &cancelable_task_tracker_);
   } else {
     // Intercept requests for prepopulated pages.
     for (size_t i = 0; i < arraysize(history::kPrepopulatedPages); i++) {
       if (url.spec() ==
           l10n_util::GetStringUTF8(history::kPrepopulatedPages[i].url_id)) {
         ui::ScaleFactor resource_scale_factor =
             ui::GetSupportedScaleFactor(parsed.device_scale_factor);
         callback.Run(
             ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
                 history::kPrepopulatedPages[i].favicon_id,
                 resource_scale_factor));
         return;
       }
     }
 
     favicon_service->GetRawFaviconForPageURL(
-        FaviconService::FaviconForPageURLParams(
-            url, icon_types_, parsed.size_in_dip),
-        parsed.device_scale_factor,
+        url,
+        icon_types_,
+        desired_size_in_pixel,
         base::Bind(
             &FaviconSource::OnFaviconDataAvailable,
             base::Unretained(this),
             IconRequest(
                 callback, url, parsed.size_in_dip, parsed.device_scale_factor)),
         &cancelable_task_tracker_);
   }
 }
 
 std::string FaviconSource::GetMimeType(const std::string&) const {
@@ skipping 71 matching lines @@
     ui::ScaleFactor resource_scale_factor =
         ui::GetSupportedScaleFactor(icon_request.device_scale_factor);
     default_favicon =
         ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
             resource_id, resource_scale_factor);
     default_favicons_[favicon_index] = default_favicon;
   }
 
   icon_request.callback.Run(default_favicon);
 }