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

chrome/browser/ui/webui/ntp/app_launcher_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/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 688 matching lines @@
     return;
   }
 
   scoped_ptr<AppInstallInfo> install_info(new AppInstallInfo());
   install_info->is_bookmark_app = true;
   install_info->title = title;
   install_info->app_url = launch_url;
   install_info->page_ordinal = page_ordinal;
 
   FaviconService::Handle h = favicon_service->GetFaviconImageForURL(
-      profile, launch_url, history::FAVICON, gfx::kFaviconSize,
-      &favicon_consumer_,
+      FaviconService::FaviconForURLParams(profile, launch_url, history::FAVICON,

[James Hawkins, 2012/09/05 22:39:50]

nit: The start of param rows must align on the same column.

+          gfx::kFaviconSize, &favicon_consumer_),
       base::Bind(&AppLauncherHandler::OnFaviconForApp, base::Unretained(this)));
   favicon_consumer_.SetClientData(favicon_service, h, install_info.release());
 }
 
 void AppLauncherHandler::HandleRecordAppLaunchByUrl(
     const base::ListValue* args) {
   std::string url;
   CHECK(args->GetString(0, &url));
   double source;
   CHECK(args->GetDouble(1, &source));
@@ skipping 219 matching lines @@
 
 ExtensionInstallPrompt* AppLauncherHandler::GetExtensionInstallPrompt() {
   if (!extension_install_ui_.get()) {
     Browser* browser = browser::FindBrowserWithWebContents(
         web_ui()->GetWebContents());
     extension_install_ui_.reset(
         chrome::CreateExtensionInstallPromptWithBrowser(browser));
   }
   return extension_install_ui_.get();
 }