Adds support for saving favicon size into history database.

chrome/browser/ui/webui/chrome_web_ui_controller_factory.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/ui/webui/chrome_web_ui_controller_factory.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ skipping 444 matching lines @@
   // allows to use ExtensionWebUI::GetFaviconForURL.
   GURL url(page_url);
   ExtensionWebUI::HandleChromeURLOverride(&url, profile);
 
   // All extensions but the bookmark manager get their favicon from the icons
   // part of the manifest.
   if (url.SchemeIs(chrome::kExtensionScheme) &&
       url.host() != extension_misc::kBookmarkManagerId) {
     ExtensionWebUI::GetFaviconForURL(profile, request, url);
   } else {
-    history::FaviconData favicon;
-    favicon.image_data = scoped_refptr<base::RefCountedMemory>(
-        GetFaviconResourceBytes(url));
-    favicon.known_icon = favicon.image_data.get() != NULL &&
-                             favicon.image_data->size() > 0;
-    favicon.icon_type = history::FAVICON;
-    request->ForwardResultAsync(request->handle(), favicon);
+    scoped_refptr<base::RefCountedMemory> bitmap(GetFaviconResourceBytes(url));
+    bool bitmap_valid = bitmap.get() != NULL && bitmap->size() > 0;
+    history::FaviconData favicon_data;
+    favicon_data.known_icon = bitmap_valid;
+    favicon_data.icon_type = history::FAVICON;
+    if (bitmap_valid) {
+      history::FaviconDataElement element;
+      element.bitmap_data = bitmap;
+      element.pixel_size = gfx::Size();
+      favicon_data.elements.push_back(element);
+    }
+    request->ForwardResultAsync(request->handle(), favicon_data);
   }
 }
 
 // static
 ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() {
   return Singleton< ChromeWebUIControllerFactory, PossibleTestSingletonTraits<
       ChromeWebUIControllerFactory, TestChromeWebUIControllerFactory> >::get();
 }
 
 ChromeWebUIControllerFactory::ChromeWebUIControllerFactory() {
@@ skipping 45 matching lines @@
   if (page_url.host() == chrome::kChromeUISettingsFrameHost)
     return options2::OptionsUI::GetFaviconResourceBytes();
 
   // Android doesn't use the plugins pages.
   if (page_url.host() == chrome::kChromeUIPluginsHost)
     return PluginsUI::GetFaviconResourceBytes();
 #endif
 
   return NULL;
 }