wip

chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index a3b1aab111047bd5bdf1e072821d46bfe5cfa3c0..84b0b5c65f3a3286f75dc64e59b364d385ef74f9 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -460,10 +460,11 @@ void ChromeWebUIControllerFactory::GetFaviconForURL(
     ExtensionWebUI::GetFaviconForURL(profile, request, url);
   } else {
     history::FaviconData favicon;
-    favicon.bitmap_data = scoped_refptr<base::RefCountedMemory>(
+    favicon.variants.resize(1);  // XXX
+    favicon.variants[0].bitmap_data = scoped_refptr<base::RefCountedMemory>(
         GetFaviconResourceBytes(url));
-    favicon.known_icon = favicon.bitmap_data.get() != NULL &&
-                             favicon.bitmap_data->size() > 0;
+    favicon.known_icon = favicon.variants[0].bitmap_data.get() != NULL &&
+                         favicon.variants[0].bitmap_data->size() > 0;
     favicon.icon_type = history::FAVICON;
     request->ForwardResultAsync(request->handle(), favicon);
   }