Revert 168079 - This CL ensures that favicons always

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 296 matching lines @@
       entry->GetFavicon().url = icon_url;
       UpdateFavicon(entry, &image);
     }
   }
 }
 
 void FaviconHandler::UpdateFavicon(NavigationEntry* entry,
     const std::vector<history::FaviconBitmapResult>& favicon_bitmap_results) {
   gfx::Image resized_image = FaviconUtil::SelectFaviconFramesFromPNGs(
       favicon_bitmap_results,
-      FaviconUtil::GetFaviconScaleFactors(),
+      ui::GetSupportedScaleFactors(),
       preferred_icon_size());
   if (!resized_image.IsEmpty())
     UpdateFavicon(entry, &resized_image);
 }
 
 void FaviconHandler::UpdateFavicon(NavigationEntry* entry,
                                    const gfx::Image* image) {
   // No matter what happens, we need to mark the favicon as being set.
   entry->GetFavicon().valid = true;
 
@@ skipping 77 matching lines @@
     std::vector<size_t> selected_bitmap_indices;
     SelectFaviconFrameIndices(sizes, scale_factors, requested_size,
                               &selected_bitmap_indices, NULL);
     DCHECK_EQ(1u, selected_bitmap_indices.size());
     size_t closest_index = selected_bitmap_indices[0];
     i->second.callback.Run(id, errored, bitmaps[closest_index]);
   } else if (current_candidate() &&
              DoUrlAndIconMatch(*current_candidate(), image_url,
                                i->second.icon_type)) {
     float score = 0.0f;
-    std::vector<ui::ScaleFactor> scale_factors =
-        FaviconUtil::GetFaviconScaleFactors();
+    std::vector<ui::ScaleFactor> scale_factors = ui::GetSupportedScaleFactors();
     gfx::Image image(SelectFaviconFrames(bitmaps, scale_factors, requested_size,
                                          &score));
 
     // The downloaded icon is still valid when there is no FaviconURL update
     // during the downloading.
     bool request_next_icon = true;
     if (!errored) {
       request_next_icon = !UpdateFaviconCandidate(
           i->second.url, image_url, image, score, i->second.icon_type);
     }
@@ skipping 38 matching lines @@
     const GURL& page_url,
     const GURL& icon_url,
     history::IconType icon_type,
     CancelableRequestConsumerBase* consumer,
     const FaviconService::FaviconResultsCallback& 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(), consumer, callback);
+      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(),
-      consumer, callback);
+      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),
-                                          callback);
+      ui::GetSupportedScaleFactors(), callback);
 }
 
 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) {
@@ skipping 138 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;
 }