Enable hidpi favicons for favicons history does not know about

chrome/browser/instant/instant_controller.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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
@@ skipping 12 matching lines @@
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/codec/png_codec.h"
+#include "ui/gfx/image/image_skia.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/widget/widget.h"
 #endif
 
 namespace {
 
 enum PreviewUsageType {
   PREVIEW_CREATED = 0,
   PREVIEW_DELETED,
@@ skipping 295 matching lines @@
     preview->history_tab_helper()->UpdateHistoryForNavigation(last_navigation);
 
     // Update the page title.
     preview->history_tab_helper()->UpdateHistoryPageTitle(*entry);
 
     // Update the favicon.
     FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
         preview->profile(), Profile::EXPLICIT_ACCESS);
     if (favicon_service && entry->GetFavicon().valid &&
         entry->GetFavicon().image.IsEmpty()) {
-      std::vector<unsigned char> image_data;
-      // TODO: Add all variants once the history service supports it.
-      gfx::PNGCodec::EncodeBGRASkBitmap(
-          entry->GetFavicon().image.AsBitmap(), false, &image_data);
-      favicon_service->SetFavicon(entry->GetURL(),
-                                  entry->GetFavicon().url,
-                                  image_data,
-                                  history::FAVICON);
+      favicon_service->SetFavicons(entry->GetURL(), entry->GetFavicon().url,
+          history::FAVICON, entry->GetFavicon().image);
     }
   }
 
   // Add a fake history entry with a non-Instant search URL, so that search
   // terms extraction (for autocomplete history matches) works.
   HistoryService* history = HistoryServiceFactory::GetForProfile(
       preview->profile(), Profile::EXPLICIT_ACCESS);
   if (history) {
     history->AddPage(url_for_history_, NULL, 0, GURL(), last_transition_type_,
                      history::RedirectList(), history::SOURCE_BROWSED, false);
@@ skipping 351 matching lines @@
       iter->second > kMaxInstantSupportFailures)
     return false;
 
   return true;
 }
 
 bool InstantController::IsOutOfDate() const {
   return !last_active_tab_ ||
          last_active_tab_ != delegate_->GetActiveTabContents();
 }