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

chrome/browser/ui/intents/web_intent_picker_controller.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/intents/web_intent_picker_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 484 matching lines @@
     const webkit_glue::WebIntentServiceData& service) {
   FaviconService* favicon_service = GetFaviconService(tab_contents_);
 
   picker_model_->AddInstalledService(
       service.title,
       service.service_url,
       service.disposition);
 
   pending_async_count_++;
   FaviconService::Handle handle = favicon_service->GetFaviconImageForURL(
-      tab_contents_->profile(),
-      service.service_url,
-      history::FAVICON,
-      gfx::kFaviconSize,
-      &favicon_consumer_,
+      FaviconService::FaviconForURLParams(
+          tab_contents_->profile(),
+          service.service_url,
+          history::FAVICON,
+          gfx::kFaviconSize,
+          &favicon_consumer_),
       base::Bind(
           &WebIntentPickerController::OnFaviconDataAvailable,
           weak_ptr_factory_.GetWeakPtr()));
   favicon_consumer_.SetClientData(
       favicon_service, handle, picker_model_->GetInstalledServiceCount() - 1);
 }
 
 void WebIntentPickerController::OnWebIntentServicesAvailable(
     const std::vector<webkit_glue::WebIntentServiceData>& services) {
   for (size_t i = 0; i < services.size(); ++i)
@@ skipping 413 matching lines @@
       UTF16ToUTF8(picker_model_->action())));
   web_intents::RecordPickerShow(uma_bucket_);
   picker_shown_ = true;
 }
 
 void WebIntentPickerController::ClosePicker() {
   SetDialogState(kPickerHidden);
   if (picker_)
     picker_->Close();
 }