Remove dependency on ui::ScaleFactor from ui/gfx

ash/drag_drop/drag_image_view.cc

 // Copyright (c) 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.
 
 #include "ash/drag_drop/drag_image_view.h"
 
 #include "skia/ext/image_operations.h"
 #include "ui/aura/window.h"
+#include "ui/base/layout.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/views/corewm/shadow_types.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
@@ skipping 64 matching lines @@
 
   // |widget_size_| is in DIP. ImageSkia::size() also returns the size in DIP.
   if (GetImage().size() == widget_size_) {
     canvas->DrawImageInt(GetImage(), 0, 0);
   } else {
     float device_scale = 1;
     if (widget_->GetNativeView() && widget_->GetNativeView()->layer()) {
       device_scale = ui::GetDeviceScaleFactor(
           widget_->GetNativeView()->layer());
     }
-    ui::ScaleFactor device_scale_factor =
-        ui::GetScaleFactorFromScale(device_scale);
-
     // The drag image already has device scale factor applied. But
     // |widget_size_| is in DIP units.
     gfx::Size scaled_widget_size = gfx::ToRoundedSize(
         gfx::ScaleSize(widget_size_, device_scale));
-    gfx::ImageSkiaRep image_rep = GetImage().GetRepresentation(
-        device_scale_factor);
+    gfx::ImageSkiaRep image_rep = GetImage().GetRepresentation(device_scale);
     if (image_rep.is_null())
       return;
     SkBitmap scaled = skia::ImageOperations::Resize(
         image_rep.sk_bitmap(), skia::ImageOperations::RESIZE_LANCZOS3,
         scaled_widget_size.width(), scaled_widget_size.height());
-    gfx::ImageSkia image_skia(gfx::ImageSkiaRep(scaled, device_scale_factor));
+    gfx::ImageSkia image_skia(gfx::ImageSkiaRep(scaled, device_scale));
     canvas->DrawImageInt(image_skia, 0, 0);
   }
 }
 
 }  // namespace internal
 }  // namespace ash