Remove dependency on ui::ScaleFactor from ui/gfx

ui/base/resource/resource_bundle_ios.mm

 // Copyright 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 "ui/base/resource/resource_bundle.h"
 
 #import <QuartzCore/QuartzCore.h>
 #import <UIKit/UIKit.h>
 
 #include "base/basictypes.h"
@@ skipping 91 matching lines @@
   }
 
   gfx::Image image;
   if (delegate_)
     image = delegate_->GetNativeImageNamed(resource_id, rtl);
 
   if (image.IsEmpty()) {
     // Load the raw data from the resource pack at the current supported scale
     // factor.  This code assumes that only one of the possible scale factors is
     // supported at runtime, based on the device resolution.
-    ui::ScaleFactor scale_factor = ui::GetMaxScaleFactor();
+    ui::ScaleFactor scale_factor = ui::GetMaxSupportedScaleFactor();
 
     scoped_refptr<base::RefCountedStaticMemory> data(
         LoadDataResourceBytesForScale(resource_id, scale_factor));
 
     if (!data.get()) {
       LOG(WARNING) << "Unable to load image with id " << resource_id;
       return GetEmptyImage();
     }
 
     // Create a data object from the raw bytes.
     base::scoped_nsobject<NSData> ns_data(
         [[NSData alloc] initWithBytes:data->front() length:data->size()]);
 
     bool is_fallback = PNGContainsFallbackMarker(data->front(), data->size());
     // Create the image from the data.
-    CGFloat target_scale = ui::GetScaleFactorScale(scale_factor);
+    CGFloat target_scale = ui::GetImageScale(scale_factor);
     CGFloat source_scale = is_fallback ? 1.0 : target_scale;
     base::scoped_nsobject<UIImage> ui_image(
         [[UIImage alloc] initWithData:ns_data scale:source_scale]);
 
     // If the image is a 1x fallback, scale it up to a full-size representation.
     if (is_fallback) {
       CGSize source_size = [ui_image size];
       CGSize target_size = CGSizeMake(source_size.width * target_scale,
                                       source_size.height * target_scale);
       base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
@@ skipping 41 matching lines @@
 
   // Another thread raced the load and has already cached the image.
   if (images_.count(resource_id))
     return images_[resource_id];
 
   images_[resource_id] = image;
   return images_[resource_id];
 }
 
 }  // namespace ui