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

trunk/src/ash/drag_drop/drag_drop_controller_unittest.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_drop_controller.h"
 
 #include "ash/drag_drop/drag_drop_tracker.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 59 matching lines @@
 
  private:
   // View overrides:
   virtual int GetDragOperations(const gfx::Point& press_pt) OVERRIDE {
     return ui::DragDropTypes::DRAG_COPY;
   }
 
   virtual void WriteDragData(const gfx::Point& p,
                              OSExchangeData* data) OVERRIDE {
     data->SetString(UTF8ToUTF16("I am being dragged"));
-    gfx::ImageSkiaRep image_rep(gfx::Size(10, 20), 1.0f);
+    gfx::ImageSkiaRep image_rep(gfx::Size(10, 20), ui::SCALE_FACTOR_100P);
     gfx::ImageSkia image_skia(image_rep);
 
     drag_utils::SetDragImageOnDataObject(
         image_skia, image_skia.size(), gfx::Vector2d(), data);
   }
 
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE {
     return true;
   }
 
@@ skipping 1008 matching lines @@
     EXPECT_EQ("405,405", observer.window_location_on_destroying().ToString());
   }
   for (Shell::RootWindowList::iterator iter = root_windows.begin();
        iter != root_windows.end(); ++iter) {
     aura::client::SetDragDropClient(*iter, NULL);
   }
 }
 
 }  // namespace test
 }  // namespace aura