Revert 224473 "Remove dependency on ui::ScaleFactor from ui/gfx"

trunk/src/content/browser/renderer_host/backing_store_aura.cc

Index: trunk/src/content/browser/renderer_host/backing_store_aura.cc
===================================================================
--- trunk/src/content/browser/renderer_host/backing_store_aura.cc	(revision 224498)
+++ trunk/src/content/browser/renderer_host/backing_store_aura.cc	(working copy)
@@ -38,7 +38,7 @@
                                    const gfx::Size& size)
     : BackingStore(widget, size) {
   device_scale_factor_ =
-      ui::GetImageScale(GetScaleFactorForView(widget->GetView()));
+      ui::GetScaleFactorScale(GetScaleFactorForView(widget->GetView()));
   gfx::Size pixel_size = ToPixelSize(size, device_scale_factor_);
   bitmap_.setConfig(SkBitmap::kARGB_8888_Config,
       pixel_size.width(), pixel_size.height());
@@ -52,7 +52,7 @@
 void BackingStoreAura::SkiaShowRect(const gfx::Point& point,
                                     gfx::Canvas* canvas) {
   gfx::ImageSkia image = gfx::ImageSkia(gfx::ImageSkiaRep(bitmap_,
-      device_scale_factor_));
+      ui::GetScaleFactorFromScale(device_scale_factor_)));
   canvas->DrawImageInt(image, point.x(), point.y());
 }