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

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

Index: trunk/src/ui/gfx/image/image_mac.mm
===================================================================
--- trunk/src/ui/gfx/image/image_mac.mm	(revision 224498)
+++ trunk/src/ui/gfx/image/image_mac.mm	(working copy)
@@ -65,7 +65,7 @@
         [[NSBitmapImageRep alloc] initWithData:ns_data]);
     if (!ns_image_rep) {
       LOG(ERROR) << "Unable to decode PNG at "
-                 << image_png_reps[i].scale
+                 << ui::GetScaleFactorScale(image_png_reps[i].scale_factor)
                  << ".";
       return GetErrorNSImage();
     }
@@ -88,7 +88,7 @@
     }
 
     if (!image.get()) {
-      float scale = image_png_reps[i].scale;
+      float scale = ui::GetScaleFactorScale(image_png_reps[i].scale_factor);
       NSSize image_size = NSMakeSize([ns_image_rep pixelsWide] / scale,
                                      [ns_image_rep pixelsHigh] / scale);
       image.reset([[NSImage alloc] initWithSize:image_size]);