Remove dependency on ui::ScaleFactor from ui/gfx

ui/gfx/image/image_skia_util_ios.h

 // 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.
 
 #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__
 @class UIImage;
 #else
 class UIImage;
 #endif
 
 namespace gfx {
 class ImageSkia;
 class ImageSkiaRep;
 
 // Converts to ImageSkia from UIImage.
 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
 // scale factor (eg Retina iPad -> 2x). Returns an autoreleased UIImage.
 UI_EXPORT UIImage* UIImageFromImageSkia(const gfx::ImageSkia& image_skia);
 
 // Converts to UIImage from ImageSkiaRep. Returns an autoreleased UIImage.
 UI_EXPORT UIImage* UIImageFromImageSkiaRep(
     const gfx::ImageSkiaRep& image_skia_rep);
 
 }  // namespace gfx
 
 #endif  // UI_GFX_IMAGE_IMAGE_SKIA_UTIL_IOS_H_