Use hi-resolution favicon variants if available.

chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.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 <vector>
 
 #include "base/file_path.h"
 #include "base/time.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 42 matching lines @@
 
  private:
   void OnUpdateFaviconURL(int32 page_id,
                           const std::vector<FaviconURL>& candidates) {
     got_favicons_ = true;
   }
 
   void OnDidDownloadFavicon(int id,
                             const GURL& image_url,
                             bool errored,
-                            const SkBitmap& bitmap) {
+                            int requested_size,
+                            const std::vector<SkBitmap>& bitmaps) {
     ++downloads_received_;
   }
 
   bool got_favicons_;
   int downloads_received_;
 };
 
 }  // namespace
 
 class LauncherFaviconLoaderBrowsertest : public InProcessBrowserTest {
@@ skipping 114 matching lines @@
   NavigateTo(panel_browser, "launcher-smallfavicon.html");
   EXPECT_TRUE(WaitForFaviconDownlads(1));
   EXPECT_TRUE(favicon_loader->GetFavicon().empty());
   ASSERT_NO_FATAL_FAILURE(ResetDownloads());
 
   NavigateTo(panel_browser, "launcher-largefavicon.html");
   EXPECT_TRUE(WaitForFaviconDownlads(1));
   EXPECT_FALSE(favicon_loader->GetFavicon().empty());
   EXPECT_EQ(128, favicon_loader->GetFavicon().height());
 }