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

chrome/browser/ui/search_engines/template_url_table_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 "chrome/browser/ui/search_engines/template_url_table_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/stl_util.h"
@@ skipping 74 matching lines @@
       // The favicon url isn't always set. Guess at one here.
       if (template_url_->url_ref().IsValid()) {
         GURL url(template_url_->url());
         if (url.is_valid())
           favicon_url = TemplateURL::GenerateFaviconURL(url);
       }
       if (!favicon_url.is_valid())
         return;
     }
     load_state_ = LOADING;
-    favicon_service->GetFaviconImage(favicon_url, history::FAVICON,
-        gfx::kFaviconSize, &request_consumer_,
+    favicon_service->GetFaviconImage(
+        FaviconService::FaviconParams(favicon_url, history::FAVICON,
+                                      gfx::kFaviconSize, &request_consumer_),
         base::Bind(&ModelEntry::OnFaviconDataAvailable,
                    base::Unretained(this)));
   }
 
   void OnFaviconDataAvailable(
       FaviconService::Handle handle,
       const history::FaviconImageResult& image_result) {
     load_state_ = LOADED;
     if (!image_result.image.IsEmpty()) {
       favicon_ = image_result.image.AsImageSkia();
@@ skipping 258 matching lines @@
 void TemplateURLTableModel::FaviconAvailable(ModelEntry* entry) {
   std::vector<ModelEntry*>::iterator i =
       std::find(entries_.begin(), entries_.end(), entry);
   DCHECK(i != entries_.end());
   NotifyChanged(static_cast<int>(i - entries_.begin()));
 }
 
 void TemplateURLTableModel::OnTemplateURLServiceChanged() {
   Reload();
 }