Remove dependency on ui::ScaleFactor from ui/gfx

ui/gfx/image/image_skia_rep.h

Index: ui/gfx/image/image_skia_rep.h
diff --git a/ui/gfx/image/image_skia_rep.h b/ui/gfx/image/image_skia_rep.h
index 6fca4111597725f9bbe6647fa1d27e8d189ef747..66179fb8971704181be97fee784c60b76fb64000 100644
--- a/ui/gfx/image/image_skia_rep.h
+++ b/ui/gfx/image/image_skia_rep.h
@@ -6,7 +6,6 @@
 #define UI_GFX_IMAGE_IMAGE_SKIA_REP_H_
 
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/base/layout.h"
 #include "ui/gfx/gfx_export.h"
 #include "ui/gfx/size.h"
 
@@ -21,11 +20,11 @@ class UI_EXPORT ImageSkiaRep {
 
   // Creates a bitmap with kARGB_8888_Config config with given |size| in DIP.
   // This allocates pixels in the bitmap.
-  ImageSkiaRep(const gfx::Size& size, ui::ScaleFactor scale_factor);
+  ImageSkiaRep(const gfx::Size& size, float scale);
 
-  // Creates a bitmap with given scale factor.
+  // Creates a bitmap with given scale.
   // Adds ref to |src|.
-  ImageSkiaRep(const SkBitmap& src, ui::ScaleFactor scale_factor);
+  ImageSkiaRep(const SkBitmap& src, float scale);
 
   // Returns true if the backing bitmap is null.
   bool is_null() const { return bitmap_.isNull(); }
@@ -42,8 +41,7 @@ class UI_EXPORT ImageSkiaRep {
   }
 
   // Retrieves the scale that the bitmap will be painted at.
-  float GetScale() const;
-  ui::ScaleFactor scale_factor() const { return scale_factor_; }
+  float scale() const { return scale_; }
 
   // Returns backing bitmap.
   const SkBitmap& sk_bitmap() const { return bitmap_; }
@@ -53,7 +51,7 @@ class UI_EXPORT ImageSkiaRep {
   SkBitmap& mutable_sk_bitmap() { return bitmap_; }
 
   SkBitmap bitmap_;
-  ui::ScaleFactor scale_factor_;
+  float scale_;
 };
 
 }  // namespace gfx