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

chrome/browser/ui/webui/favicon_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/favicon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
@@ skipping 37 matching lines @@
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (!favicon_service || path.empty()) {
     SendDefaultResponse(request_id);
     return;
   }
 
   FaviconService::Handle handle;
   if (path.size() > 8 && path.substr(0, 8) == "iconurl/") {
     // TODO : Change GetFavicon to support combination of IconType.
     handle = favicon_service->GetRawFavicon(
-        GURL(path.substr(8)),
-        history::FAVICON,
-        gfx::kFaviconSize,
+        FaviconService::FaviconParams(
+            GURL(path.substr(8)),
+            history::FAVICON,
+            gfx::kFaviconSize,
+            &cancelable_consumer_),
         ui::SCALE_FACTOR_100P,
-        &cancelable_consumer_,
         base::Bind(&FaviconSource::OnFaviconDataAvailable,
                    base::Unretained(this)));
   } else {
     GURL url;
 
     if (path.size() > 5 && path.substr(0, 5) == "size/") {
       size_t slash = path.find("/", 5);
       std::string size = path.substr(5, slash - 5);
       int pixel_size = atoi(size.c_str());
       CHECK(pixel_size == 32 || pixel_size == 16) <<
@@ skipping 29 matching lines @@
         SendResponse(request_id,
             ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
                 history::kPrepopulatedPages[i].favicon_id,
                 ui::SCALE_FACTOR_100P));
         return;
       }
     }
 
     // TODO(estade): fetch the requested size.
     handle = favicon_service->GetRawFaviconForURL(
-        profile_,
-        url,
-        icon_types_,
-        gfx::kFaviconSize,
+        FaviconService::FaviconForURLParams(
+            profile_,
+            url,
+            icon_types_,
+            gfx::kFaviconSize,
+            &cancelable_consumer_),
         ui::SCALE_FACTOR_100P,
-        &cancelable_consumer_,
         base::Bind(&FaviconSource::OnFaviconDataAvailable,
                    base::Unretained(this)));
   }
 
   // Attach the ChromeURLDataManager request ID to the history request.
   cancelable_consumer_.SetClientData(favicon_service, handle, request_id);
 }
 
 std::string FaviconSource::GetMimeType(const std::string&) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
@@ skipping 37 matching lines @@
       default_favicon_ =
           ResourceBundle::GetSharedInstance().LoadDataResourceBytes(
               IDR_DEFAULT_FAVICON, ui::SCALE_FACTOR_100P);
     }
     bytes = default_favicon_;
   }
   request_size_map_.erase(request_id);
 
   SendResponse(request_id, bytes);
 }