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

trunk/src/chrome/browser/extensions/extension_action_icon_factory_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 "chrome/browser/extensions/extension_action_icon_factory.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 20 matching lines @@
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
 using content::BrowserThread;
 
 namespace extensions {
 namespace {
 
 bool ImageRepsAreEqual(const gfx::ImageSkiaRep& image_rep1,
                        const gfx::ImageSkiaRep& image_rep2) {
-  return image_rep1.scale() == image_rep2.scale() &&
+  return image_rep1.scale_factor() == image_rep2.scale_factor() &&
          gfx::BitmapsAreEqual(image_rep1.sk_bitmap(), image_rep2.sk_bitmap());
 }
 
 gfx::Image EnsureImageSize(const gfx::Image& original, int size) {
   const SkBitmap* original_bitmap = original.ToSkBitmap();
   if (original_bitmap->width() == size && original_bitmap->height() == size)
     return original;
 
   SkBitmap resized = skia::ImageOperations::Resize(
       *original.ToSkBitmap(), skia::ImageOperations::RESIZE_LANCZOS3,
       size, size);
   return gfx::Image::CreateFrom1xBitmap(resized);
 }
 
-gfx::ImageSkiaRep CreateBlankRep(int size_dip, float scale) {
-  SkBitmap bitmap;
-  bitmap.setConfig(SkBitmap::kARGB_8888_Config,
-                   static_cast<int>(size_dip * scale),
-                   static_cast<int>(size_dip * scale));
-  bitmap.allocPixels();
-  bitmap.eraseColor(SkColorSetARGB(0, 0, 0, 0));
-  return gfx::ImageSkiaRep(bitmap, scale);
+gfx::ImageSkiaRep CreateBlankRep(int size_dip, ui::ScaleFactor scale_factor) {
+    SkBitmap bitmap;
+    const float scale = ui::GetScaleFactorScale(scale_factor);
+    bitmap.setConfig(SkBitmap::kARGB_8888_Config,
+                     static_cast<int>(size_dip * scale),
+                     static_cast<int>(size_dip * scale));
+    bitmap.allocPixels();
+    bitmap.eraseColor(SkColorSetARGB(0, 0, 0, 0));
+    return gfx::ImageSkiaRep(bitmap, scale_factor);
 }
 
 gfx::Image LoadIcon(const std::string& filename) {
   base::FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
   path = path.AppendASCII("extensions/api_test").AppendASCII(filename);
 
   std::string file_contents;
   base::ReadFileToString(path, &file_contents);
   const unsigned char* data =
@@ skipping 121 matching lines @@
   ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());
 
   gfx::ImageSkia favicon = GetFavicon();
 
   ExtensionActionIconFactory icon_factory(
       profile(), extension.get(), browser_action, this);
 
   gfx::Image icon = icon_factory.GetIcon(0);
 
   EXPECT_TRUE(ImageRepsAreEqual(
-      favicon.GetRepresentation(1.0f),
-      icon.ToImageSkia()->GetRepresentation(1.0f)));
+      favicon.GetRepresentation(ui::SCALE_FACTOR_100P),
+      icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P)));
 }
 
 // If the icon has been set using |SetIcon|, the factory should return that
 // icon.
 TEST_F(ExtensionActionIconFactoryTest, AfterSetIcon) {
   // Load an extension that has browser action without default icon set in the
   // manifest and does not call |SetIcon| by default (but has an browser action
   // icon resource).
   scoped_refptr<Extension> extension(CreateExtension(
       "browser_action/no_icon", Manifest::INVALID_LOCATION));
   ASSERT_TRUE(extension.get() != NULL);
   ExtensionAction* browser_action = GetBrowserAction(*extension.get());
   ASSERT_TRUE(browser_action);
   ASSERT_FALSE(browser_action->default_icon());
   ASSERT_TRUE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());
 
   gfx::Image set_icon = LoadIcon("browser_action/no_icon/icon.png");
   ASSERT_FALSE(set_icon.IsEmpty());
 
   browser_action->SetIcon(0, set_icon);
 
   ASSERT_FALSE(browser_action->GetExplicitlySetIcon(0 /*tab id*/).isNull());
 
   ExtensionActionIconFactory icon_factory(
       profile(), extension.get(), browser_action, this);
 
   gfx::Image icon = icon_factory.GetIcon(0);
 
   EXPECT_TRUE(ImageRepsAreEqual(
-      set_icon.ToImageSkia()->GetRepresentation(1.0f),
-      icon.ToImageSkia()->GetRepresentation(1.0f)));
+      set_icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P),
+      icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P)));
 
   // It should still return favicon for another tabs.
   icon = icon_factory.GetIcon(1);
 
   EXPECT_TRUE(ImageRepsAreEqual(
-      GetFavicon().GetRepresentation(1.0f),
-      icon.ToImageSkia()->GetRepresentation(1.0f)));
+      GetFavicon().GetRepresentation(ui::SCALE_FACTOR_100P),
+      icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P)));
 }
 
 // If there is a default icon, and the icon has not been set using |SetIcon|,
 // the factory should return the default icon.
 TEST_F(ExtensionActionIconFactoryTest, DefaultIcon) {
   // Load an extension that has browser action without default icon set in the
   // manifest and does not call |SetIcon| by default (but has an browser action
   // icon resource).
   scoped_refptr<Extension> extension(CreateExtension(
       "browser_action/no_icon", Manifest::INVALID_LOCATION));
@@ skipping 14 matching lines @@
   ASSERT_TRUE(browser_action->default_icon());
 
   ExtensionActionIconFactory icon_factory(
       profile(), extension.get(), browser_action, this);
 
   gfx::Image icon = icon_factory.GetIcon(0);
 
   // The icon should be loaded asynchronously. Initially a transparent icon
   // should be returned.
   EXPECT_TRUE(ImageRepsAreEqual(
-      CreateBlankRep(19, 1.0f),
-      icon.ToImageSkia()->GetRepresentation(1.0f)));
+      CreateBlankRep(19, ui::SCALE_FACTOR_100P),
+      icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P)));
 
   WaitForIconUpdate();
 
   icon = icon_factory.GetIcon(0);
 
   // The default icon representation should be loaded at this point.
   EXPECT_TRUE(ImageRepsAreEqual(
-      default_icon.ToImageSkia()->GetRepresentation(1.0f),
-      icon.ToImageSkia()->GetRepresentation(1.0f)));
+      default_icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P),
+      icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P)));
 
   // The same icon should be returned for the other tabs.
   icon = icon_factory.GetIcon(1);
 
   EXPECT_TRUE(ImageRepsAreEqual(
-      default_icon.ToImageSkia()->GetRepresentation(1.0f),
-      icon.ToImageSkia()->GetRepresentation(1.0f)));
+      default_icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P),
+      icon.ToImageSkia()->GetRepresentation(ui::SCALE_FACTOR_100P)));
 
 }
 
 }  // namespace
 }  // namespace extensions