Use hi-resolution favicon variants if available.

chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc

Index: chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc
diff --git a/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc
index 33a08df67b54f38f6813e8be753650c4cbc6e8d4..6c106ffa248aae9bfbefd28b3f84b93d3061cf20 100644
--- a/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc
+++ b/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.cc
@@ -43,7 +43,8 @@ class FaviconBitmapHandler {
   void OnDidDownloadFavicon(int id,
                             const GURL& image_url,
                             bool errored,
-                            const SkBitmap& bitmap);
+                            int requested_size,
+                            const std::vector<SkBitmap>& bitmaps);
 
  private:
   void DownloadFavicon(const GURL& image_url);
@@ -112,10 +113,13 @@ void FaviconBitmapHandler::DownloadFavicon(const GURL& image_url) {
   FaviconUtil::DownloadFavicon(host, image_url, image_size);
 }
 
-void FaviconBitmapHandler::OnDidDownloadFavicon(int id,
-                                                const GURL& image_url,
-                                                bool errored,
-                                                const SkBitmap& bitmap) {
+
+void FaviconBitmapHandler::OnDidDownloadFavicon(
+    int id,
+    const GURL& image_url,
+    bool errored,
+    int requested_size,
+    const std::vector<SkBitmap>& bitmaps) {
   UrlSet::iterator iter = pending_requests_.find(image_url);
   if (iter == pending_requests_.end()) {
     // Updates are received for all downloads; ignore unrequested urls.
@@ -123,8 +127,9 @@ void FaviconBitmapHandler::OnDidDownloadFavicon(int id,
   }
   pending_requests_.erase(iter);
 
-  if (!errored)
-    AddFavicon(image_url, bitmap);
+  // Favicon bitmaps are ordered by decreasing width.
+  if (!errored && !bitmaps.empty())
+    AddFavicon(image_url, bitmaps[0]);
 }
 
 void FaviconBitmapHandler::AddFavicon(const GURL& image_url,
@@ -179,9 +184,12 @@ void LauncherFaviconLoader::OnUpdateFaviconURL(
   favicon_handler_->OnUpdateFaviconURL(page_id, candidates);
 }
 
-void LauncherFaviconLoader::OnDidDownloadFavicon(int id,
-                                                 const GURL& image_url,
-                                                 bool errored,
-                                                 const SkBitmap& bitmap) {
-  favicon_handler_->OnDidDownloadFavicon(id, image_url, errored, bitmap);
+void LauncherFaviconLoader::OnDidDownloadFavicon(
+    int id,
+    const GURL& image_url,
+    bool errored,
+    int requested_size,
+    const std::vector<SkBitmap>& bitmaps) {
+  favicon_handler_->OnDidDownloadFavicon(
+      id, image_url, errored, requested_size, bitmaps);
 }