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

chrome/browser/jumplist_win.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/jumplist_win.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 691 matching lines @@
           base::Bind(&JumpList::RunUpdate, this));
       return;
     }
     // Ask FaviconService if it has a favicon of a URL.
     // When FaviconService has one, it will call OnFaviconDataAvailable().
     url = GURL(icon_urls_.front().first);
   }
   FaviconService* favicon_service =
       FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   handle_ = favicon_service->GetFaviconImageForURL(
-      profile_, url, history::FAVICON, gfx::kFaviconSize, &favicon_consumer_,
+      FaviconService::FaviconForURLParams(profile_, url, history::FAVICON,
+          gfx::kFaviconSize, &favicon_consumer_),
       base::Bind(&JumpList::OnFaviconDataAvailable, base::Unretained(this)));
 }
 
 void JumpList::OnFaviconDataAvailable(
     FaviconService::Handle handle,
     const history::FaviconImageResult& image_result) {
   // If there is currently a favicon request in progress, it is now outdated,
   // as we have received another, so nullify the handle from the old request.
   handle_ = NULL;
   // lock the list to set icon data and pop the url
@@ skipping 53 matching lines @@
 }
 
 void JumpList::CreateIconFiles(const ShellLinkItemList& item_list) {
   for (ShellLinkItemList::const_iterator item = item_list.begin();
       item != item_list.end(); ++item) {
     FilePath icon_path;
     if (CreateIconFile((*item)->data(), icon_dir_, &icon_path))
       (*item)->SetIcon(icon_path.value(), 0, true);
   }
 }