Remove dependency on ui::ScaleFactor from ui/gfx

ash/display/mirror_window_controller.cc

Index: ash/display/mirror_window_controller.cc
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 2de135ad570149912535dcb8f9c540b46ce0f05a..d7cd6f0f36c036d23eaf439484ab9904283a5f4d 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -127,10 +127,8 @@ class CursorWindowDelegate : public aura::WindowDelegate {
   // take 2x's image and paint as if it's 1x image.
   void SetCursorImage(const gfx::ImageSkia& image,
                       const gfx::Display& display) {
-    device_scale_factor_ =
-        ui::GetScaleFactorFromScale(display.device_scale_factor());
     const gfx::ImageSkiaRep& image_rep =
-        image.GetRepresentation(device_scale_factor_);
+        image.GetRepresentation(display.device_scale_factor());
     size_ = image_rep.pixel_size();
     cursor_image_ = gfx::ImageSkia::CreateFrom1xBitmap(image_rep.sk_bitmap());
   }
@@ -139,7 +137,6 @@ class CursorWindowDelegate : public aura::WindowDelegate {
 
  private:
   gfx::ImageSkia cursor_image_;
-  ui::ScaleFactor device_scale_factor_;
   gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorWindowDelegate);