Remove dependency on ui::ScaleFactor from ui/gfx

chrome/browser/ui/webui/fileicon_source.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/ui/webui/fileicon_source.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
@@ skipping 85 matching lines @@
     const base::FilePath& path,
     ui::ScaleFactor scale_factor,
     IconLoader::IconSize icon_size,
     const content::URLDataSource::GotDataCallback& callback) {
   IconManager* im = g_browser_process->icon_manager();
   gfx::Image* icon = im->LookupIconFromFilepath(path, icon_size);
 
   if (icon) {
     scoped_refptr<base::RefCountedBytes> icon_data(new base::RefCountedBytes);
     gfx::PNGCodec::EncodeBGRASkBitmap(
-        icon->ToImageSkia()->GetRepresentation(scale_factor).sk_bitmap(),
+        icon->ToImageSkia()->GetRepresentation(
+            ui::GetScaleFactorScale(scale_factor)).sk_bitmap(),
         false, &icon_data->data());
 
     callback.Run(icon_data.get());
   } else {
     // Attach the ChromeURLDataManager request ID to the history request.
     IconRequestDetails details;
     details.callback = callback;
     details.scale_factor = scale_factor;
 
     // Icon was not in cache, go fetch it slowly.
@@ skipping 26 matching lines @@
 std::string FileIconSource::GetMimeType(const std::string&) const {
   // Rely on image decoder inferring the correct type.
   return std::string();
 }
 
 void FileIconSource::OnFileIconDataAvailable(const IconRequestDetails& details,
                                              gfx::Image* icon) {
   if (icon) {
     scoped_refptr<base::RefCountedBytes> icon_data(new base::RefCountedBytes);
     gfx::PNGCodec::EncodeBGRASkBitmap(
-        icon->ToImageSkia()->GetRepresentation(details.scale_factor)
-            .sk_bitmap(),
+        icon->ToImageSkia()->GetRepresentation(
+            ui::GetScaleFactorScale(details.scale_factor)).sk_bitmap(),
         false,
         &icon_data->data());
 
     details.callback.Run(icon_data.get());
   } else {
     // TODO(glen): send a dummy icon.
     details.callback.Run(NULL);
   }
 }