Introduce structures to reduce the number of arguments in the FaviconService methods.

chrome/browser/favicon/favicon_handler.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_handler.h"
 
 #include "build/build_config.h"
 
 #include <vector>
 
@@ skipping 361 matching lines @@
     const FaviconService::FaviconResultsCallback& callback) {
   GetFaviconService()->UpdateFaviconMappingAndFetch(page_url, icon_url,
       icon_type, consumer, callback);
 }
 
 void FaviconHandler::GetFavicon(
     const GURL& icon_url,
     history::IconType icon_type,
     CancelableRequestConsumerBase* consumer,
     const FaviconService::FaviconResultsCallback& callback) {
-  GetFaviconService()->GetFavicon(icon_url, icon_type, preferred_icon_size(),
-      ui::GetSupportedScaleFactors(), consumer, callback);
+  GetFaviconService()->GetFavicon(
+      FaviconService::FaviconParams(icon_url, icon_type,
+                                    preferred_icon_size(), consumer),
+      ui::GetSupportedScaleFactors(), callback);
 }
 
 void FaviconHandler::GetFaviconForURL(
     const GURL& page_url,
     int icon_types,
     CancelableRequestConsumerBase* consumer,
     const FaviconService::FaviconResultsCallback& callback) {
-  GetFaviconService()->GetFaviconForURL(profile_, page_url, icon_types,
-      preferred_icon_size(), ui::GetSupportedScaleFactors(), consumer,
-      callback);
+  GetFaviconService()->GetFaviconForURL(
+      FaviconService::FaviconForURLParams(profile_, page_url, icon_types,
+                                          preferred_icon_size(), consumer),
+      ui::GetSupportedScaleFactors(), callback);
 }
 
 void FaviconHandler::SetHistoryFavicon(
     const GURL& page_url,
     const GURL& icon_url,
     const std::vector<unsigned char>& image_data,
     history::IconType icon_type) {
   GetFaviconService()->SetFavicon(page_url, icon_url, image_data, icon_type);
 }
 
@@ skipping 159 matching lines @@
   int height = bitmap.height();
   if (width > 0 && height > 0) {
     gfx::CalculateFaviconTargetSize(&width, &height);
     return gfx::Image(skia::ImageOperations::Resize(
                           bitmap, skia::ImageOperations::RESIZE_LANCZOS3,
                           width, height));
   }
 
   return image;
 }