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

chrome/browser/ui/webui/extensions/extension_icon_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/extensions/extension_icon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/stl_util.h"
@@ skipping 197 matching lines @@
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   // Fall back to the default icons if the service isn't available.
   if (favicon_service == NULL) {
     LoadDefaultImage(request_id);
     return;
   }
 
   GURL favicon_url = GetData(request_id)->extension->GetFullLaunchURL();
   FaviconService::Handle handle = favicon_service->GetRawFaviconForURL(
-      profile_,
-      favicon_url,
-      history::FAVICON,
-      gfx::kFaviconSize,
+      FaviconService::FaviconForURLParams(
+          profile_,
+          favicon_url,
+          history::FAVICON,
+          gfx::kFaviconSize,
+          &cancelable_consumer_),
       ui::SCALE_FACTOR_100P,
-      &cancelable_consumer_,
       base::Bind(&ExtensionIconSource::OnFaviconDataAvailable,
                  base::Unretained(this)));
   cancelable_consumer_.SetClientData(favicon_service, handle, request_id);
 }
 
 void ExtensionIconSource::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
     const history::FaviconBitmapResult& bitmap_result) {
   int request_id = cancelable_consumer_.GetClientData(
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS),
@@ skipping 111 matching lines @@
 
 void ExtensionIconSource::ClearData(int request_id) {
   std::map<int, ExtensionIconRequest*>::iterator i =
       request_map_.find(request_id);
   if (i == request_map_.end())
     return;
 
   delete i->second;
   request_map_.erase(i);
 }