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

trunk/src/ash/desktop_background/wallpaper_resizer_unittest.cc

 // Copyright 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/desktop_background/wallpaper_resizer.h"
 
 #include "ash/desktop_background/wallpaper_resizer_observer.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 86 matching lines @@
   WallpaperLayout layouts[4] = {
       WALLPAPER_LAYOUT_CENTER,
       WALLPAPER_LAYOUT_CENTER_CROPPED,
       WALLPAPER_LAYOUT_STRETCH,
       WALLPAPER_LAYOUT_TILE,
   };
   const int length = arraysize(layouts);
 
   for (int i = 0; i < length; i++) {
     WallpaperLayout layout = layouts[i];
-    gfx::ImageSkia small_image(gfx::ImageSkiaRep(gfx::Size(10, 20), 1.0f));
+    gfx::ImageSkia small_image(gfx::ImageSkiaRep(gfx::Size(10, 20),
+                                                 ui::SCALE_FACTOR_100P));
 
     gfx::ImageSkia resized_small = Resize(small_image, gfx::Size(800, 600),
                                           layout);
     EXPECT_EQ(10, resized_small.width());
     EXPECT_EQ(20, resized_small.height());
 
-    gfx::ImageSkia large_image(gfx::ImageSkiaRep(gfx::Size(1000, 1000), 1.0f));
+    gfx::ImageSkia large_image(gfx::ImageSkiaRep(gfx::Size(1000, 1000),
+                                                 ui::SCALE_FACTOR_100P));
     gfx::ImageSkia resized_large = Resize(large_image, gfx::Size(800, 600),
                                           layout);
     EXPECT_EQ(800, resized_large.width());
     EXPECT_EQ(600, resized_large.height());
   }
 }
 
 // Test for crbug.com/244629. "CENTER_CROPPED generates the same image as
 // STRETCH layout"
 TEST_F(WallpaperResizerTest, AllLayoutDifferent) {
@@ skipping 11 matching lines @@
   gfx::ImageSkia tile = Resize(image, target_size, WALLPAPER_LAYOUT_TILE);
 
   EXPECT_TRUE(IsColor(center, kExpectedCenter));
   EXPECT_TRUE(IsColor(center_cropped, kExpectedCenterCropped));
   EXPECT_TRUE(IsColor(stretch, kExpectedStretch));
   EXPECT_TRUE(IsColor(tile, kExpectedTile));
 }
 
 }  // namespace internal
 }  // namespace ash