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

chrome/browser/ui/webui/ntp/favicon_webui_handler.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/ntp/favicon_webui_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 93 matching lines @@
       scoped_ptr<StringValue> color(
           SkColorToCss(history::kPrepopulatedPages[i].color));
       web_ui()->CallJavascriptFunction("ntp.setFaviconDominantColor",
                                        dom_id_value, *color);
       return;
     }
   }
 
   dom_id_map_[id_] = dom_id;
   FaviconService::Handle handle = favicon_service->GetRawFaviconForURL(
-      Profile::FromWebUI(web_ui()),
-      url,
-      history::FAVICON,
-      gfx::kFaviconSize,
+      FaviconService::FaviconForURLParams(
+          Profile::FromWebUI(web_ui()),
+          url,
+          history::FAVICON,
+          gfx::kFaviconSize,
+          &consumer_),
       ui::SCALE_FACTOR_100P,
-      &consumer_,
       base::Bind(&FaviconWebUIHandler::OnFaviconDataAvailable,
                  base::Unretained(this)));
   consumer_.SetClientData(favicon_service, handle, id_++);
 }
 
 void FaviconWebUIHandler::OnFaviconDataAvailable(
     FaviconService::Handle request_handle,
     const history::FaviconBitmapResult& bitmap_result) {
   FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
       Profile::FromWebUI(web_ui()), Profile::EXPLICIT_ACCESS);
@@ skipping 31 matching lines @@
   std::vector<unsigned char> bits;
   if (!gfx::PNGCodec::EncodeBGRASkBitmap(bitmap, true, &bits))
     return;
   scoped_refptr<base::RefCountedStaticMemory> bits_mem(
       new base::RefCountedStaticMemory(&bits.front(), bits.size()));
   scoped_ptr<StringValue> color_value(GetDominantColorCssString(bits_mem));
   StringValue id(extension_id);
   web_ui()->CallJavascriptFunction(
       "ntp.setFaviconDominantColor", id, *color_value);
 }