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

chrome/browser/ui/webui/ntp/android/bookmarks_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/android/bookmarks_handler.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 337 matching lines @@
   if (args && !args->empty() && ParseNtpBookmarkId(args, &id, &is_partner)) {
     DCHECK(partner_bookmarks_shim_ != NULL);
     const BookmarkNode* node =
         partner_bookmarks_shim_->GetNodeByID(id, is_partner);
     if (!node)
       return;
 
     FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
         profile, Profile::EXPLICIT_ACCESS);
     FaviconService::Handle handle = favicon_service->GetRawFaviconForURL(
-        profile,
-        node->url(),
-        history::FAVICON | history::TOUCH_ICON,
-        gfx::kFaviconSize,
+        FaviconService::FaviconForURLParams(
+            profile,
+            node->url(),
+            history::FAVICON | history::TOUCH_ICON,
+            gfx::kFaviconSize,
+            &cancelable_consumer_),
         ui::SCALE_FACTOR_100P,
-        &cancelable_consumer_,
         base::Bind(&BookmarksHandler::OnShortcutFaviconDataAvailable,
                    base::Unretained(this)));
     cancelable_consumer_.SetClientData(favicon_service, handle, node);
   }
 }
 
 void BookmarksHandler::OnShortcutFaviconDataAvailable(
     FaviconService::Handle handle,
     const history::FaviconBitmapResult& bitmap_result) {
   SkColor color = SK_ColorWHITE;
@@ skipping 12 matching lines @@
       handle);
 
   TabAndroid* tab = TabAndroid::FromWebContents(
       web_ui()->GetWebContents());
   if (tab) {
     tab->AddShortcutToBookmark(node->url(), node->GetTitle(),
                                favicon_bitmap, SkColorGetR(color),
                                SkColorGetG(color), SkColorGetB(color));
   }
 }