Adds support for saving favicon size into history database.

chrome/browser/history/history.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.
 
 // The history system runs on a background thread so that potentially slow
 // database operations don't delay the browser. This backend processing is
 // represented by HistoryBackend. The HistoryService's job is to dispatch to
 // that thread.
 //
 // Main thread                       History thread
@@ skipping 475 matching lines @@
 HistoryService::Handle HistoryService::GetPageThumbnail(
     const GURL& page_url,
     CancelableRequestConsumerBase* consumer,
     const ThumbnailDataCallback& callback) {
   return Schedule(PRIORITY_NORMAL, &HistoryBackend::GetPageThumbnail, consumer,
                   new history::GetPageThumbnailRequest(callback), page_url);
 }
 
 void HistoryService::GetFavicon(FaviconService::GetFaviconRequest* request,
                                 const GURL& icon_url,
+                                const gfx::Size& pixel_size,
                                 history::IconType icon_type) {
   Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFavicon, NULL, request,
-           icon_url, icon_type);
+           icon_url, pixel_size, icon_type);
 }
 
 void HistoryService::UpdateFaviconMappingAndFetch(
     FaviconService::GetFaviconRequest* request,
     const GURL& page_url,
     const GURL& icon_url,
+    const gfx::Size& pixel_size,
     history::IconType icon_type) {
   Schedule(PRIORITY_NORMAL, &HistoryBackend::UpdateFaviconMappingAndFetch, NULL,
-           request, page_url, icon_url, history::FAVICON);
+           request, page_url, icon_url, pixel_size, history::FAVICON);
 }
 
 void HistoryService::GetFaviconForURL(
     FaviconService::GetFaviconRequest* request,
     const GURL& page_url,
+    const gfx::Size& pixel_size,
     int icon_types) {
   Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFaviconForURL, NULL, request,
-           page_url, icon_types);
+           page_url, pixel_size, icon_types);
 }
 
 void HistoryService::GetFaviconForID(FaviconService::GetFaviconRequest* request,
                                      history::FaviconID id) {
   Schedule(PRIORITY_NORMAL, &HistoryBackend::GetFaviconForID, NULL, request,
            id);
 }
 
 void HistoryService::SetFavicon(const GURL& page_url,
                                 const GURL& icon_url,
                                 const std::vector<unsigned char>& image_data,
+                                const gfx::Size& requested_size,
                                 history::IconType icon_type) {
   if (!CanAddURL(page_url))
     return;
 
   ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::SetFavicon,
       page_url, icon_url,
       scoped_refptr<base::RefCountedMemory>(
           new base::RefCountedBytes(image_data)),
-      icon_type);
+      requested_size, icon_type);
 }
 
 void HistoryService::SetFaviconOutOfDateForPage(const GURL& page_url) {
   ScheduleAndForget(PRIORITY_NORMAL,
                     &HistoryBackend::SetFaviconOutOfDateForPage, page_url);
 }
 
 void HistoryService::CloneFavicon(const GURL& old_page_url,
                                   const GURL& new_page_url) {
   ScheduleAndForget(PRIORITY_NORMAL, &HistoryBackend::CloneFavicon,
@@ skipping 393 matching lines @@
 void HistoryService::RemoveVisitDatabaseObserver(
     history::VisitDatabaseObserver* observer) {
   visit_database_observers_->RemoveObserver(observer);
 }
 
 void HistoryService::NotifyVisitDBObserversOnAddVisit(
     const history::BriefVisitInfo& info) {
   visit_database_observers_->Notify(
       &history::VisitDatabaseObserver::OnAddVisit, info);
 }