Remove dependency on ui::ScaleFactor from ui/gfx

ui/gfx/image/image_skia_util_ios.h

Index: ui/gfx/image/image_skia_util_ios.h
diff --git a/ui/gfx/image/image_skia_util_ios.h b/ui/gfx/image/image_skia_util_ios.h
index 57c9698b9554156b531ca0cd8f16fcb6b1df9d69..6c5f30dfcf7f2387c7ae90155b1dc8b43fd22801 100644
--- a/ui/gfx/image/image_skia_util_ios.h
+++ b/ui/gfx/image/image_skia_util_ios.h
@@ -5,7 +5,6 @@
 #ifndef UI_GFX_IMAGE_IMAGE_SKIA_UTIL_IOS_H_
 #define UI_GFX_IMAGE_IMAGE_SKIA_UTIL_IOS_H_
 
-#include "ui/base/layout.h"
 #include "ui/gfx/gfx_export.h"
 
 #ifdef __OBJC__
@@ -22,13 +21,11 @@ class ImageSkiaRep;
 UI_EXPORT gfx::ImageSkia ImageSkiaFromUIImage(UIImage* image);
 
 // Converts to an ImageSkiaRep of |scale_factor| from UIImage.
-// |scale_factor| is passed explicitly in order to allow this method to be used
-// with a |scale_factor| which is not supported by the platform.
-// (ui::GetScaleFactorFromScale() is restricted to the platform's supported
-// scale factors.)
-UI_EXPORT gfx::ImageSkiaRep ImageSkiaRepOfScaleFactorFromUIImage(
+// |scale| is passed explicitly in order to allow this method to be used
+// with a |scale| which is not supported by the platform.
+UI_EXPORT gfx::ImageSkiaRep ImageSkiaRepOfScaleFromUIImage(
     UIImage* image,
-    ui::ScaleFactor scale_factor);
+    float scale);
 
 // Converts to UIImage from ImageSkia. The returned UIImage will be at the scale
 // of the ImageSkiaRep in |image_skia| which most closely matches the device's