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

chrome/browser/favicon/favicon_service.cc

Index: chrome/browser/favicon/favicon_service.cc
diff --git a/chrome/browser/favicon/favicon_service.cc b/chrome/browser/favicon/favicon_service.cc
index ad4a79dfbd1672fc657b7b593a2010a763161e06..ad0fab619dc9ae1caf0b8cac412047758976674d 100644
--- a/chrome/browser/favicon/favicon_service.cc
+++ b/chrome/browser/favicon/favicon_service.cc
@@ -20,58 +20,49 @@ FaviconService::FaviconService(HistoryService* history_service)
 }
 
 FaviconService::Handle FaviconService::GetFaviconImage(
-    const GURL& icon_url,
-    history::IconType icon_type,
-    int desired_size_in_dip,
-    CancelableRequestConsumerBase* consumer,
+    const FaviconParams& params,
     const FaviconImageCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(base::Bind(
       &FaviconService::GetFaviconImageCallback,
       base::Unretained(this),
-      desired_size_in_dip,
+      params.desired_size_in_dip,
       callback));
-  AddRequest(request, consumer);
+  AddRequest(request, params.consumer);
   // TODO(pkotwicz): Pass in desired size and scale factors.
   if (history_service_)
-    history_service_->GetFavicon(request, icon_url, icon_type);
+    history_service_->GetFavicon(request, params.icon_url, params.icon_type);
   else
     ForwardEmptyResultAsync(request);
   return request->handle();
 }
 
 FaviconService::Handle FaviconService::GetRawFavicon(
-    const GURL& icon_url,
-    history::IconType icon_type,
-    int desired_size_in_dip,
+    const FaviconParams& params,
     ui::ScaleFactor desired_scale_factor,
-    CancelableRequestConsumerBase* consumer,
     const FaviconRawCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(base::Bind(
       &FaviconService::GetRawFaviconCallback,
       base::Unretained(this),
-      desired_size_in_dip,
+      params.desired_size_in_dip,
       desired_scale_factor,
       callback));
-  AddRequest(request, consumer);
+  AddRequest(request, params.consumer);
   // TODO(pkotwicz): Pass in desired size and scale factor.
   if (history_service_)
-    history_service_->GetFavicon(request, icon_url, icon_type);
+    history_service_->GetFavicon(request, params.icon_url, params.icon_type);
   else
     ForwardEmptyResultAsync(request);
   return request->handle();
 }
 
 FaviconService::Handle FaviconService::GetFavicon(
-    const GURL& icon_url,
-    history::IconType icon_type,
-    int desired_size_in_dip,
+    const FaviconParams& params,
     const std::vector<ui::ScaleFactor>& desired_scale_factors,
-    CancelableRequestConsumerBase* consumer,
     const FaviconResultsCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(callback);
-  AddRequest(request, consumer);
+  AddRequest(request, params.consumer);
   if (history_service_)
-    history_service_->GetFavicon(request, icon_url, icon_type);
+    history_service_->GetFavicon(request, params.icon_url, params.icon_type);
   else
     ForwardEmptyResultAsync(request);
   return request->handle();
@@ -94,56 +85,41 @@ FaviconService::Handle FaviconService::UpdateFaviconMappingAndFetch(
 }
 
 FaviconService::Handle FaviconService::GetFaviconImageForURL(
-    Profile* profile,
-    const GURL& page_url,
-    int icon_types,
-    int desired_size_in_dip,
-    CancelableRequestConsumerBase* consumer,
+    const FaviconForURLParams& params,
     const FaviconImageCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(base::Bind(
       &FaviconService::GetFaviconImageCallback,
       base::Unretained(this),
-      desired_size_in_dip,
+      params.desired_size_in_dip,
       callback));
 
   std::vector<ui::ScaleFactor> desired_scale_factors =
       ui::GetSupportedScaleFactors();
-  return GetFaviconForURLImpl(profile, page_url, icon_types,
-      desired_size_in_dip, desired_scale_factors, consumer, request);
+  return GetFaviconForURLImpl(params, desired_scale_factors, request);
 }
 
 FaviconService::Handle FaviconService::GetRawFaviconForURL(
-    Profile* profile,
-    const GURL& page_url,
-    int icon_types,
-    int desired_size_in_dip,
+    const FaviconForURLParams& params,
     ui::ScaleFactor desired_scale_factor,
-    CancelableRequestConsumerBase* consumer,
     const FaviconRawCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(base::Bind(
       &FaviconService::GetRawFaviconCallback,
       base::Unretained(this),
-      desired_size_in_dip,
+      params.desired_size_in_dip,
       desired_scale_factor,
       callback));
 
   std::vector<ui::ScaleFactor> desired_scale_factors;
   desired_scale_factors.push_back(desired_scale_factor);
-  return GetFaviconForURLImpl(profile, page_url, icon_types,
-      desired_size_in_dip, desired_scale_factors, consumer, request);
+  return GetFaviconForURLImpl(params, desired_scale_factors, request);
 }
 
 FaviconService::Handle FaviconService::GetFaviconForURL(
-    Profile* profile,
-    const GURL& page_url,
-    int icon_types,
-    int desired_size_in_dip,
+    const FaviconForURLParams& params,
     const std::vector<ui::ScaleFactor>& desired_scale_factors,
-    CancelableRequestConsumerBase* consumer,
     const FaviconResultsCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(callback);
-  return GetFaviconForURLImpl(profile, page_url, icon_types,
-      desired_size_in_dip, desired_scale_factors, consumer, request);
+  return GetFaviconForURLImpl(params, desired_scale_factors, request);
 }
 
 FaviconService::Handle FaviconService::GetRawFaviconForID(
@@ -200,26 +176,25 @@ FaviconService::~FaviconService() {
 }
 
 FaviconService::Handle FaviconService::GetFaviconForURLImpl(
-    Profile* profile,
-    const GURL& page_url,
-    int icon_types,
-    int desired_size_in_dip,
+    const FaviconForURLParams& params,
     const std::vector<ui::ScaleFactor>& desired_scale_factors,
-    CancelableRequestConsumerBase* consumer,
     GetFaviconRequest* request) {
-  AddRequest(request, consumer);
+  AddRequest(request, params.consumer);
   FaviconService::Handle handle = request->handle();
-  if (page_url.SchemeIs(chrome::kChromeUIScheme) ||
-      page_url.SchemeIs(chrome::kExtensionScheme)) {
+  if (params.page_url.SchemeIs(chrome::kChromeUIScheme) ||
+      params.page_url.SchemeIs(chrome::kExtensionScheme)) {
     // TODO(pkotwicz): Pass in desired size and desired scale factors.
     ChromeWebUIControllerFactory::GetInstance()->GetFaviconForURL(
-        profile, request, page_url);
+        params.profile, request, params.page_url);
   } else {
     // TODO(pkotwicz): Pass in desired size and desired scale factors.
-    if (history_service_)
-      history_service_->GetFaviconForURL(request, page_url, icon_types);
-    else
+    if (history_service_) {
+      history_service_->GetFaviconForURL(request,
+                                         params.page_url,
+                                         params.icon_types);
+    } else {
       ForwardEmptyResultAsync(request);
+    }
   }
   return handle;
 }