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

chrome/browser/bookmarks/bookmark_html_writer.cc

Index: chrome/browser/bookmarks/bookmark_html_writer.cc
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc
index 501bed3e1fad960871604bbd354e630fb919424a..6e2412d24964e5b50e0aa077aaf1b24171783888 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer.cc
@@ -461,9 +461,10 @@ bool BookmarkFaviconFetcher::FetchNextFavicon() {
     if (favicons_map_->end() == iter) {
       FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
           profile_, Profile::EXPLICIT_ACCESS);
-      favicon_service->GetRawFaviconForURL(profile_, GURL(url),
-          history::FAVICON, gfx::kFaviconSize, ui::SCALE_FACTOR_100P,
-          &favicon_consumer_,
+      favicon_service->GetRawFaviconForURL(
+          FaviconService::FaviconForURLParams(profile_, GURL(url),
+              history::FAVICON, gfx::kFaviconSize, &favicon_consumer_),
+          ui::SCALE_FACTOR_100P,
           base::Bind(&BookmarkFaviconFetcher::OnFaviconDataAvailable,
                      base::Unretained(this)));
       return true;