Remove dependency on ui::ScaleFactor from ui/gfx

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 49 matching lines @@
       base_size = gfx::kFaviconSize;
       break;
     case chrome::TOUCH_ICON:
     case chrome::TOUCH_PRECOMPOSED_ICON:
       base_size = kTouchIconSize;
       break;
     case chrome::INVALID_ICON:
       base_size = 0;
       break;
   }
-  return ui::GetScaleFactorScale(ui::GetMaxScaleFactor()) * base_size;
+  return gfx::ImageSkia::GetMaxSupportedScale() * base_size;
 }
 
 bool DoUrlAndIconMatch(const FaviconURL& favicon_url,
                        const GURL& url,
                        chrome::IconType icon_type) {
   return favicon_url.icon_url == url &&
       favicon_url.icon_type == static_cast<FaviconURL::IconType>(icon_type);
 }
 
 // Returns true if all of the icon URLs and icon types in |bitmap_results| are
@@ skipping 60 matching lines @@
   // - Favicons inserted into the history backend by sync.
   // - Favicons for imported bookmarks.
   std::vector<gfx::Size> favicon_sizes;
   for (size_t i = 0; i < bitmap_results.size(); ++i)
     favicon_sizes.push_back(bitmap_results[i].pixel_size);
 
   std::vector<ui::ScaleFactor> scale_factors =
       FaviconUtil::GetFaviconScaleFactors();
   for (size_t i = 0; i < scale_factors.size(); ++i) {
     int edge_size_in_pixel = floor(
-        desired_size_in_dip * ui::GetScaleFactorScale(scale_factors[i]));
+        desired_size_in_dip * ui::GetImageScale(scale_factors[i]));
     std::vector<gfx::Size>::iterator it = std::find(favicon_sizes.begin(),
         favicon_sizes.end(), gfx::Size(edge_size_in_pixel, edge_size_in_pixel));
     if (it == favicon_sizes.end())
       return true;
   }
   return false;
 }
 
 // Returns true if at least one of |bitmap_results| is valid.
 bool HasValidResult(
@@ skipping 465 matching lines @@
       GetMaximalIconSize(icon_type));
   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, icon_type);
   }
 
   return download_id;
 }