Remove dependency on ui::ScaleFactor from ui/gfx

ash/display/mirror_window_controller.cc

 // Copyright (c) 2013 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.
 
 #include "ash/display/mirror_window_controller.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 
 // Xlib.h defines RootWindow.
@@ skipping 106 matching lines @@
   }
   virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
   virtual void DidRecreateLayer(ui::Layer* old_layer,
                                 ui::Layer* new_layer) OVERRIDE {}
 
   // Set the cursor image for the |display|'s scale factor.  Note that
   // mirror window's scale factor is always 1.0f, therefore we need to
   // 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());
   }
 
   const gfx::Size size() const { return size_; }
 
  private:
   gfx::ImageSkia cursor_image_;
-  ui::ScaleFactor device_scale_factor_;
   gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(CursorWindowDelegate);
 };
 
 MirrorWindowController::MirrorWindowController()
     : current_cursor_type_(ui::kCursorNone),
       current_cursor_rotation_(gfx::Display::ROTATE_0),
       cursor_window_(NULL),
       cursor_window_delegate_(new CursorWindowDelegate) {
@@ skipping 183 matching lines @@
       Shell::GetScreen()->GetPrimaryDisplay().id());
   DCHECK(display_manager->mirrored_display().is_valid());
   return scoped_ptr<aura::RootWindowTransformer>(
       internal::CreateRootWindowTransformerForMirroredDisplay(
           source_display_info,
           mirror_display_info));
 }
 
 }  // namespace internal
 }  // namespace ash