Enable hidpi favicons for favicons history does not know about

chrome/browser/favicon/favicon_handler.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/favicon/favicon_handler.h"
 
 #include "build/build_config.h"
 
 #include <algorithm>
 #include <vector>
@@ skipping 231 matching lines @@
         url, image_url, image, score, icon_type);
   }
   return exact_match;
 }
 
 void FaviconHandler::SetFavicon(
     const GURL& url,
     const GURL& icon_url,
     const gfx::Image& image,
     history::IconType icon_type) {
-  if (GetFaviconService() && ShouldSaveFavicon(url)) {
-    std::vector<unsigned char> image_data;
-    if (gfx::PNGEncodedDataFromImage(image, &image_data))
-      SetHistoryFavicon(url, icon_url, image_data, icon_type);
-  }
+  if (GetFaviconService() && ShouldSaveFavicon(url))
+    SetHistoryFavicons(url, icon_url, icon_type, image);
 
   if (UrlMatches(url, url_) && icon_type == history::FAVICON) {
     NavigationEntry* entry = GetEntry();
     if (entry) {
       entry->GetFavicon().url = icon_url;
       UpdateFavicon(entry, &image);
     }
   }
 }
 
@@ skipping 150 matching lines @@
   int id = delegate_->StartDownload(image_url, image_size);
   return id;
 }
 
 void FaviconHandler::UpdateFaviconMappingAndFetch(
     const GURL& page_url,
     const GURL& icon_url,
     history::IconType icon_type,
     CancelableRequestConsumerBase* consumer,
     const FaviconService::FaviconResultsCallback& callback) {
-  GetFaviconService()->UpdateFaviconMappingAndFetch(page_url, icon_url,
-      icon_type, consumer, callback);
+  // TODO(pkotwicz): pass in all of |image_urls_| to
+  // UpdateFaviconMappingsAndFetch().
+  std::vector<GURL> icon_urls;
+  icon_urls.push_back(icon_url);
+  GetFaviconService()->UpdateFaviconMappingsAndFetch(page_url, icon_urls,
+      icon_type, preferred_icon_size(), ui::GetSupportedScaleFactors(),
+      consumer, callback);
 }
 
 void FaviconHandler::GetFavicon(
     const GURL& icon_url,
     history::IconType icon_type,
     CancelableRequestConsumerBase* consumer,
     const FaviconService::FaviconResultsCallback& callback) {
   GetFaviconService()->GetFavicon(icon_url, icon_type, preferred_icon_size(),
       ui::GetSupportedScaleFactors(), consumer, callback);
 }
 
 void FaviconHandler::GetFaviconForURL(
     const GURL& page_url,
     int icon_types,
     CancelableRequestConsumerBase* consumer,
     const FaviconService::FaviconResultsCallback& callback) {
   GetFaviconService()->GetFaviconForURL(
       FaviconService::FaviconForURLParams(profile_, page_url, icon_types,
                                           preferred_icon_size(), consumer),
       ui::GetSupportedScaleFactors(), callback);
 }
 
-void FaviconHandler::SetHistoryFavicon(
-    const GURL& page_url,
-    const GURL& icon_url,
-    const std::vector<unsigned char>& image_data,
-    history::IconType icon_type) {
-  GetFaviconService()->SetFavicon(page_url, icon_url, image_data, icon_type);
+void FaviconHandler::SetHistoryFavicons(const GURL& page_url,
+                                        const GURL& icon_url,
+                                        history::IconType icon_type,
+                                        const gfx::Image& image) {
+  GetFaviconService()->SetFavicons(page_url, icon_url, icon_type, image);
 }
 
 bool FaviconHandler::ShouldSaveFavicon(const GURL& url) {
   if (!profile_->IsOffTheRecord())
     return true;
 
   // Otherwise store the favicon if the page is bookmarked.
   BookmarkModel* bookmark_model =
       BookmarkModelFactory::GetForProfile(profile_);
   return bookmark_model && bookmark_model->IsBookmarked(url);
@@ skipping 128 matching lines @@
   const int download_id = DownloadFavicon(image_url, image_size);
   if (download_id) {
     // Download ids should be unique.
     DCHECK(download_requests_.find(download_id) == download_requests_.end());
     download_requests_[download_id] =
         DownloadRequest(url, image_url, callback, icon_type);
   }
 
   return download_id;
 }