Enable hidpi favicons for favicons history does not know about

chrome/browser/favicon/favicon_handler_unittest.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 "base/memory/scoped_ptr.h"
 #include "chrome/browser/favicon/favicon_handler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 282 matching lines @@
     history_handler_.reset(new HistoryRequestHandler(page_url, GURL(),
                                                      icon_types, callback));
   }
 
   virtual int DownloadFavicon(const GURL& image_url, int image_size) OVERRIDE {
     download_id_++;
     download_handler_->AddDownload(download_id_, image_url, image_size);
     return download_id_;
   }
 
-  virtual void SetHistoryFavicon(const GURL& page_url,
-                                 const GURL& icon_url,
-                                 const std::vector<unsigned char>& bitmap_data,
-                                 history::IconType icon_type) OVERRIDE {
+  virtual void SetHistoryFavicons(const GURL& page_url,
+                                  const GURL& icon_url,
+                                  history::IconType icon_type,
+                                  const gfx::Image& image) OVERRIDE {
+    std::vector<unsigned char> bitmap_data;
+    if (!image.IsEmpty())
+      bitmap_data = *image.ToImagePNG();
     history_handler_.reset(new HistoryRequestHandler(
-        page_url, icon_url,icon_type, bitmap_data,
+        page_url, icon_url, icon_type, bitmap_data,
         FaviconService::FaviconResultsCallback()));
   }
 
   virtual FaviconService* GetFaviconService() OVERRIDE {
     // Just give none NULL value, so overridden methods can be hit.
     return (FaviconService*)(1);
   }
 
   virtual bool ShouldSaveFavicon(const GURL& url) OVERRIDE {
     return true;
@@ skipping 684 matching lines @@
   download_handler->SetImageSize(kLargeSize);
   download_handler->InvokeCallback();
 
   // Check that the callback was invoked with the unresized bitmap.
   const gfx::Size& downloaded_bitmap_size = downloader.downloaded_bitmap_size();
   EXPECT_EQ(kLargeSize, downloaded_bitmap_size.width());
   EXPECT_EQ(kLargeSize, downloaded_bitmap_size.height());
 }
 
 }  // namespace.