Adds support for saving favicon size into history database.

chrome/browser/favicon/favicon_service.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/favicon/favicon_service.h"
 
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/common/url_constants.h"
 
 FaviconService::FaviconService(Profile* profile) : profile_(profile) {
 }
 
 FaviconService::Handle FaviconService::GetFavicon(
     const GURL& icon_url,
     history::IconType icon_type,
     CancelableRequestConsumerBase* consumer,
     const FaviconDataCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(callback);
   AddRequest(request, consumer);
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  // There should only ever be a single favicon per history::IconType so
+  // the requested size does not matter.
   if (hs)
-    hs->GetFavicon(request, icon_url, icon_type);
+    hs->GetFaviconClosestToSize(request, icon_url, icon_type, gfx::Size());
   else
     ForwardEmptyResultAsync(request);
   return request->handle();
 }
 
 FaviconService::Handle FaviconService::UpdateFaviconMappingAndFetch(
     const GURL& page_url,
     const GURL& icon_url,
     history::IconType icon_type,
     CancelableRequestConsumerBase* consumer,
     const FaviconDataCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(callback);
   AddRequest(request, consumer);
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-  if (hs)
-    hs->UpdateFaviconMappingAndFetch(request, page_url, icon_url, icon_type);
-  else
+  if (hs) {
+    std::vector<GURL> icon_urls;
+    icon_urls.push_back(icon_url);
+    hs->UpdateFaviconMappingsAndFetch(request, page_url, icon_urls, icon_type);
+  } else {
     ForwardEmptyResultAsync(request);
+  }
   return request->handle();
 }
 
 FaviconService::Handle FaviconService::GetFaviconForURL(
     const GURL& page_url,
     int icon_types,
     CancelableRequestConsumerBase* consumer,
     const FaviconDataCallback& callback) {
   GetFaviconRequest* request = new GetFaviconRequest(callback);
   AddRequest(request, consumer);
   FaviconService::Handle handle = request->handle();
   if (page_url.SchemeIs(chrome::kChromeUIScheme) ||
       page_url.SchemeIs(chrome::kExtensionScheme)) {
     ChromeWebUIControllerFactory::GetInstance()->GetFaviconForURL(
         profile_, request, page_url);
   } else {
     HistoryService* hs = HistoryServiceFactory::GetForProfile(
         profile_, Profile::EXPLICIT_ACCESS);
-    if (hs)
-      hs->GetFaviconForURL(request, page_url, icon_types);
-    else
+    if (hs) {
+      // There should only ever be a single favicon per history::IconType so
+      // the requested size does not matter.
+      hs->GetFaviconForURLClosestToSize(request, page_url, icon_types,
+                                        gfx::Size());
+    } else {
       ForwardEmptyResultAsync(request);
+    }
   }
   return handle;
 }
 
-// Requests the favicon for |favicon_id|. The |consumer| is notified when the
-// bits have been fetched.
-FaviconService::Handle FaviconService::GetFaviconForID(
-    history::FaviconID favicon_id,
-    CancelableRequestConsumerBase* consumer,
-    const FaviconDataCallback& callback) {
-  GetFaviconRequest* request = new GetFaviconRequest(callback);
-  AddRequest(request, consumer);
-  FaviconService::Handle handle = request->handle();
-  HistoryService* hs =
-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-  if (hs)
-    hs->GetFaviconForID(request, favicon_id);
-  else
-    ForwardEmptyResultAsync(request);
-
-  return handle;
-}
-
-
 void FaviconService::SetFaviconOutOfDateForPage(const GURL& page_url) {
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (hs)
-    hs->SetFaviconOutOfDateForPage(page_url);
+    hs->SetFaviconsOutOfDateForPage(page_url);
 }
 
 void FaviconService::CloneFavicon(const GURL& old_page_url,
                                   const GURL& new_page_url) {
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (hs)
     hs->CloneFavicon(old_page_url, new_page_url);
 }
 
 void FaviconService::SetImportedFavicons(
     const std::vector<history::ImportedFaviconUsage>& favicon_usage) {
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
   if (hs)
     hs->SetImportedFavicons(favicon_usage);
 }
 
 void FaviconService::SetFavicon(const GURL& page_url,
                                 const GURL& icon_url,
                                 const std::vector<unsigned char>& image_data,
                                 history::IconType icon_type) {
   HistoryService* hs =
       HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-  if (hs)
-    hs->SetFavicon(page_url, icon_url, image_data, icon_type);
+  if (hs) {
+    history::FaviconDataElement element;
+    element.bitmap_data = scoped_refptr<base::RefCountedMemory>(
+        new base::RefCountedBytes(image_data));
+    // As there should be only a single favicon per history::IconType the size
+    // we use for inserting the favicon does not matter as long as the same
+    // size is used for inserting everywhere.
+    element.pixel_size = gfx::Size();
+    element.icon_url = icon_url;
+    std::vector<history::FaviconDataElement> elements;
+    elements.push_back(element);
+    history::IconURLSizesMap icon_url_sizes;
+    icon_url_sizes[icon_url].InsertSize(gfx::Size());
+    hs->SetFavicons(page_url, icon_type, elements, icon_url_sizes);
+  }
 }
 
 FaviconService::~FaviconService() {
 }
 
 void FaviconService::ForwardEmptyResultAsync(GetFaviconRequest* request) {
   request->ForwardResultAsync(request->handle(), history::FaviconData());
 }