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

chrome/browser/ui/toolbar/back_forward_menu_model.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 "build/build_config.h"
 
 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 233 matching lines @@
   if (requested_favicons_.find(entry->GetUniqueID()) !=
       requested_favicons_.end()) {
     return;
   }
   requested_favicons_.insert(entry->GetUniqueID());
   FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
       browser_->profile(), Profile::EXPLICIT_ACCESS);
   if (!favicon_service)
     return;
   FaviconService::Handle handle = favicon_service->GetFaviconImageForURL(
-      browser_->profile(), entry->GetURL(), history::FAVICON,
-      gfx::kFaviconSize, &load_consumer_,
+      FaviconService::FaviconForURLParams(browser_->profile(), entry->GetURL(),
+          history::FAVICON, gfx::kFaviconSize, &load_consumer_),
       base::Bind(&BackForwardMenuModel::OnFavIconDataAvailable,
                  base::Unretained(this)));
   load_consumer_.SetClientData(favicon_service, handle, entry->GetUniqueID());
 }
 
 void BackForwardMenuModel::OnFavIconDataAvailable(
     FaviconService::Handle handle,
     const history::FaviconImageResult& image_result) {
   if (!image_result.image.IsEmpty()) {
     int unique_id = load_consumer_.GetClientDataForCurrentRequest();
@@ skipping 204 matching lines @@
     metric_string += "ForwardMenu_";
   else
     metric_string += "BackMenu_";
   metric_string += action;
   if (index != -1) {
     // +1 is for historical reasons (indices used to start at 1).
     metric_string += base::IntToString(index + 1);
   }
   return metric_string;
 }