Enable hidpi favicons for favicons history does not know about

chrome/browser/ui/toolbar/back_forward_menu_model_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 "chrome/browser/ui/toolbar/back_forward_menu_model.h"
 
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 497 matching lines @@
   scoped_ptr<Browser> browser(
       chrome::CreateBrowserWithTestWindowForProfile(profile()));
   FaviconDelegate favicon_delegate;
 
   BackForwardMenuModel back_model(
       browser.get(), BackForwardMenuModel::BACKWARD_MENU);
   back_model.set_test_web_contents(controller().GetWebContents());
   back_model.SetMenuModelDelegate(&favicon_delegate);
 
   SkBitmap new_icon_bitmap(CreateBitmap(SK_ColorRED));
-  std::vector<unsigned char> icon_data;
-  gfx::PNGCodec::EncodeBGRASkBitmap(new_icon_bitmap, false, &icon_data);
 
   GURL url1 = GURL("http://www.a.com/1");
   GURL url2 = GURL("http://www.a.com/2");
   GURL url1_favicon("http://www.a.com/1/favicon.ico");
 
   NavigateAndCommit(url1);
   // Navigate to a new URL so that url1 will be in the BackForwardMenuModel.
   NavigateAndCommit(url2);
 
   // Set the desired favicon for url1.
   HistoryServiceFactory::GetForProfile(
       profile(), Profile::EXPLICIT_ACCESS)->AddPage(
           url1, history::SOURCE_BROWSED);
   FaviconServiceFactory::GetForProfile(
-      profile(), Profile::EXPLICIT_ACCESS)->SetFavicon(
-          url1, url1_favicon, icon_data, history::FAVICON);
+      profile(), Profile::EXPLICIT_ACCESS)->SetFavicons(
+          url1, url1_favicon, history::FAVICON, gfx::Image(new_icon_bitmap));
 
   // Will return the current icon (default) but start an anync call
   // to retrieve the favicon from the favicon service.
   gfx::Image default_icon;
   back_model.GetIconAt(0, &default_icon);
 
   // Make the favicon service run GetFavIconForURL,
   // FaviconDelegate.OnIconChanged will be called.
   MessageLoop::current()->Run();
 
@@ skipping 18 matching lines @@
   // Verify we did get the expected favicon.
   EXPECT_EQ(0, memcmp(new_icon_bitmap.getPixels(),
                       valid_icon_bitmap.getPixels(),
                       new_icon_bitmap.getSize()));
 
   // Make sure the browser deconstructor doesn't have problems.
   chrome::CloseAllTabs(browser.get());
   // This is required to prevent the message loop from hanging.
   profile()->DestroyHistoryService();
 }