Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/ui/gfx/image/image_skia_util_ios.mm

Index: trunk/src/ui/gfx/image/image_skia_util_ios.mm
===================================================================
--- trunk/src/ui/gfx/image/image_skia_util_ios.mm	(revision 224498)
+++ trunk/src/ui/gfx/image/image_skia_util_ios.mm	(working copy)
@@ -16,37 +16,39 @@
 
 gfx::ImageSkia ImageSkiaFromUIImage(UIImage* image) {
   gfx::ImageSkia image_skia;
-  float max_scale = ImageSkia::GetSupportedScales().back();
-  gfx::ImageSkiaRep image_skia_rep = ImageSkiaRepOfScaleFromUIImage(
-      image, max_scale);
+  gfx::ImageSkiaRep image_skia_rep = ImageSkiaRepOfScaleFactorFromUIImage(
+      image, ui::GetMaxScaleFactor());
   if (!image_skia_rep.is_null())
     image_skia.AddRepresentation(image_skia_rep);
   return image_skia;
 }
 
-gfx::ImageSkiaRep ImageSkiaRepOfScaleFromUIImage(UIImage* image, float scale) {
+gfx::ImageSkiaRep ImageSkiaRepOfScaleFactorFromUIImage(
+    UIImage* image,
+    ui::ScaleFactor scale_factor) {
   if (!image)
     return gfx::ImageSkiaRep();
 
+  float scale = ui::GetScaleFactorScale(scale_factor);
   CGSize size = image.size;
   CGSize desired_size_for_scale =
       CGSizeMake(size.width * scale, size.height * scale);
   SkBitmap bitmap(gfx::CGImageToSkBitmap(image.CGImage,
                                          desired_size_for_scale,
                                          false));
-  return gfx::ImageSkiaRep(bitmap, scale);
+  return gfx::ImageSkiaRep(bitmap, scale_factor);
 }
 
 UIImage* UIImageFromImageSkia(const gfx::ImageSkia& image_skia) {
-  return UIImageFromImageSkiaRep(
-      image_skia.GetRepresentation(ImageSkia::GetSupportedScales().back()));
+  return UIImageFromImageSkiaRep(image_skia.GetRepresentation(
+      ui::GetMaxScaleFactor()));
 }
 
 UIImage* UIImageFromImageSkiaRep(const gfx::ImageSkiaRep& image_skia_rep) {
   if (image_skia_rep.is_null())
     return nil;
 
-  float scale = image_skia_rep.scale();
+  float scale = ui::GetScaleFactorScale(image_skia_rep.scale_factor());
   base::ScopedCFTypeRef<CGColorSpaceRef> color_space(
       CGColorSpaceCreateDeviceRGB());
   return gfx::SkBitmapToUIImageWithColorSpace(image_skia_rep.sk_bitmap(), scale,