Index: chrome/browser/history/history_service.cc |
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc |
index 6618462bcbdd7c49c2bdb4d8f1df4f647cb35e3d..3bbb0e9d0766f06d97417624c347a2212d3395a8 100644 |
--- a/chrome/browser/history/history_service.cc |
+++ b/chrome/browser/history/history_service.cc |
@@ -617,18 +617,18 @@ void HistoryService::MergeFavicon( |
icon_url, icon_type, bitmap_data, pixel_size); |
} |
-void HistoryService::SetFavicons( |
+void HistoryService::SetFavicon( |
const GURL& page_url, |
favicon_base::IconType icon_type, |
- const std::vector<favicon_base::FaviconRawBitmapData>& |
- favicon_bitmap_data) { |
+ const GURL& icon_url, |
+ const std::vector<SkBitmap>& bitmaps) { |
DCHECK(thread_) << "History service being called after cleanup"; |
DCHECK(thread_checker_.CalledOnValidThread()); |
if (!CanAddURL(page_url)) |
return; |
- ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetFavicons, page_url, |
- icon_type, favicon_bitmap_data); |
+ ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetFavicon, page_url, |
+ icon_type, icon_url, bitmaps); |
} |
void HistoryService::SetFaviconsOutOfDateForPage(const GURL& page_url) { |