Remove dependency on ui::ScaleFactor from ui/gfx

ui/gfx/image/image_skia_rep.cc

Index: ui/gfx/image/image_skia_rep.cc
diff --git a/ui/gfx/image/image_skia_rep.cc b/ui/gfx/image/image_skia_rep.cc
index 005b9a3f54b5f1743828cc34429fb5849d957613..f8f3acb19468e0ff8a295880d136734f11a7bfce 100644
--- a/ui/gfx/image/image_skia_rep.cc
+++ b/ui/gfx/image/image_skia_rep.cc
@@ -6,41 +6,30 @@
 
 namespace gfx {
 
-ImageSkiaRep::ImageSkiaRep()
-    : scale_factor_(ui::SCALE_FACTOR_NONE) {
+ImageSkiaRep::ImageSkiaRep() : scale_(1.0f) {
 }
 
 ImageSkiaRep::~ImageSkiaRep() {
 }
 
-ImageSkiaRep::ImageSkiaRep(const gfx::Size& size,
-                           ui::ScaleFactor scale_factor)
-    : scale_factor_(scale_factor) {
-  float scale = ui::GetScaleFactorScale(scale_factor);
+ImageSkiaRep::ImageSkiaRep(const gfx::Size& size, float scale) : scale_(scale) {
   bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
                     static_cast<int>(size.width() * scale),
                     static_cast<int>(size.height() * scale));
   bitmap_.allocPixels();
 }
 
-ImageSkiaRep::ImageSkiaRep(const SkBitmap& src,
-                           ui::ScaleFactor scale_factor)
+ImageSkiaRep::ImageSkiaRep(const SkBitmap& src, float scale)
     : bitmap_(src),
-      scale_factor_(scale_factor) {
+      scale_(scale) {
 }
 
 int ImageSkiaRep::GetWidth() const {
-  return static_cast<int>(bitmap_.width() /
-      ui::GetScaleFactorScale(scale_factor_));
+  return static_cast<int>(bitmap_.width() / scale_);
 }
 
 int ImageSkiaRep::GetHeight() const {
-  return static_cast<int>(bitmap_.height() /
-      ui::GetScaleFactorScale(scale_factor_));
-}
-
-float ImageSkiaRep::GetScale() const {
-  return ui::GetScaleFactorScale(scale_factor_);
+  return static_cast<int>(bitmap_.height() / scale_);
 }
 
 }  // namespace gfx