Cleanup history favicon code

chrome/browser/history/history.cc

Index: chrome/browser/history/history.cc
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index f42849c2210079cef15ffa4efcbb16f86ee91d2a..3e396e98f9cd207a6402b9e4844b4eef92ad3443 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -107,8 +107,8 @@ void DerefDownloadId(
 
 void RunWithFaviconResults(
     const FaviconService::FaviconResultsCallback& callback,
-    const HistoryBackend::FaviconResults* results) {
-  callback.Run(results->bitmap_results, results->size_map);
+    std::vector<history::FaviconBitmapResult>* bitmap_results) {
+  callback.Run(*bitmap_results);
 }
 
 // Extract history::URLRows into GURLs for VisitedLinkMaster.
@@ -617,8 +617,8 @@ CancelableTaskTracker::TaskId HistoryService::GetFavicons(
   DCHECK(thread_checker_.CalledOnValidThread());
   LoadBackendIfNecessary();
 
-  HistoryBackend::FaviconResults* results =
-      new HistoryBackend::FaviconResults();
+  std::vector<history::FaviconBitmapResult>* results =
+      new std::vector<history::FaviconBitmapResult>();
   return tracker->PostTaskAndReply(
       thread_->message_loop_proxy(),
       FROM_HERE,
@@ -638,8 +638,8 @@ CancelableTaskTracker::TaskId HistoryService::GetFaviconsForURL(
   DCHECK(thread_checker_.CalledOnValidThread());
   LoadBackendIfNecessary();
 
-  HistoryBackend::FaviconResults* results =
-      new HistoryBackend::FaviconResults();
+  std::vector<history::FaviconBitmapResult>* results =
+      new std::vector<history::FaviconBitmapResult>();
   return tracker->PostTaskAndReply(
       thread_->message_loop_proxy(),
       FROM_HERE,
@@ -658,8 +658,8 @@ CancelableTaskTracker::TaskId HistoryService::GetFaviconForID(
   DCHECK(thread_checker_.CalledOnValidThread());
   LoadBackendIfNecessary();
 
-  HistoryBackend::FaviconResults* results =
-      new HistoryBackend::FaviconResults();
+  std::vector<history::FaviconBitmapResult>* results =
+      new std::vector<history::FaviconBitmapResult>();
   return tracker->PostTaskAndReply(
       thread_->message_loop_proxy(),
       FROM_HERE,
@@ -680,8 +680,8 @@ CancelableTaskTracker::TaskId HistoryService::UpdateFaviconMappingsAndFetch(
   DCHECK(thread_checker_.CalledOnValidThread());
   LoadBackendIfNecessary();
 
-  HistoryBackend::FaviconResults* results =
-      new HistoryBackend::FaviconResults();
+  std::vector<history::FaviconBitmapResult>* results =
+      new std::vector<history::FaviconBitmapResult>();
   return tracker->PostTaskAndReply(
       thread_->message_loop_proxy(),
       FROM_HERE,
@@ -708,14 +708,13 @@ void HistoryService::MergeFavicon(
 void HistoryService::SetFavicons(
     const GURL& page_url,
     history::IconType icon_type,
-    const std::vector<history::FaviconBitmapData>& favicon_bitmap_data,
-    const history::IconURLSizesMap& icon_url_sizes) {
+    const std::vector<history::FaviconBitmapData>& favicon_bitmap_data) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!CanAddURL(page_url))
     return;
 
   ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetFavicons, page_url,
-      icon_type, favicon_bitmap_data, icon_url_sizes);
+      icon_type, favicon_bitmap_data);
 }
 
 void HistoryService::SetFaviconsOutOfDateForPage(const GURL& page_url) {