Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/common/extensions/extension_action_unittest.cc

Index: chrome/common/extensions/extension_action_unittest.cc
diff --git a/chrome/common/extensions/extension_action_unittest.cc b/chrome/common/extensions/extension_action_unittest.cc
index 9cf8ed86ca31ca426e7f507b504d62df7dc91fc7..995c7486786fb1662e6490db53683964dadc2953 100644
--- a/chrome/common/extensions/extension_action_unittest.cc
+++ b/chrome/common/extensions/extension_action_unittest.cc
@@ -13,17 +13,17 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "webkit/glue/image_decoder.h"
 
 namespace {
 
-bool ImagesAreEqual(const gfx::Image& i1, const gfx::Image& i2) {
-  return gfx::BitmapsAreEqual(*i1.ToSkBitmap(), *i2.ToSkBitmap());
+bool ImagesAreEqual(const gfx::ImageSkia& i1, const gfx::ImageSkia& i2) {
+  return gfx::BitmapsAreEqual(*i1.bitmap(), *i2.bitmap());
 }
 
-gfx::Image LoadIcon(const std::string& filename) {
+gfx::ImageSkia LoadIcon(const std::string& filename) {
   FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
   path = path.AppendASCII("extensions").AppendASCII(filename);
@@ -37,7 +37,7 @@ gfx::Image LoadIcon(const std::string& filename) {
   webkit_glue::ImageDecoder decoder;
   bitmap = decoder.Decode(data, file_contents.length());
 
-  return gfx::Image(bitmap);
+  return gfx::ImageSkia(bitmap);
 }
 
 class ExtensionActionTest : public testing::Test {
@@ -64,11 +64,11 @@ TEST_F(ExtensionActionTest, Title) {
 }
 
 TEST_F(ExtensionActionTest, Icon) {
-  gfx::Image puzzle_piece =
-      ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+  gfx::ImageSkia puzzle_piece =
+     *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           IDR_EXTENSIONS_FAVICON);
-  gfx::Image icon1 = LoadIcon("icon1.png");
-  gfx::Image icon2 = LoadIcon("icon2.png");
+  gfx::ImageSkia icon1 = LoadIcon("icon1.png");
+  gfx::ImageSkia icon2 = LoadIcon("icon2.png");
   ASSERT_TRUE(ImagesAreEqual(puzzle_piece, action.GetIcon(1)));
 
   action.set_default_icon_path("the_default.png");
@@ -77,20 +77,20 @@ TEST_F(ExtensionActionTest, Icon) {
   action.CacheIcon("the_default.png", icon2);
   ASSERT_TRUE(ImagesAreEqual(icon2, action.GetIcon(1)));
 
-  action.SetIcon(ExtensionAction::kDefaultTabId, *icon1.ToSkBitmap());
+  action.SetIcon(ExtensionAction::kDefaultTabId, icon1);
   ASSERT_TRUE(ImagesAreEqual(icon1, action.GetIcon(100)))
       << "SetIcon(kDefaultTabId) overrides the default_icon_path.";
 
-  action.SetIcon(100, *icon2.ToSkBitmap());
+  action.SetIcon(100, *icon2.bitmap());
   ASSERT_TRUE(ImagesAreEqual(icon1, action.GetIcon(1)));
   ASSERT_TRUE(ImagesAreEqual(icon2, action.GetIcon(100)));
 }
 
 TEST_F(ExtensionActionTest, IconIndex) {
-  gfx::Image icon1 = LoadIcon("icon1.png");
-  gfx::Image icon2 = LoadIcon("icon2.png");
-  gfx::Image puzzle_piece =
-      ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+  gfx::ImageSkia icon1 = LoadIcon("icon1.png");
+  gfx::ImageSkia icon2 = LoadIcon("icon2.png");
+  gfx::ImageSkia puzzle_piece =
+      *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           IDR_EXTENSIONS_FAVICON);
 
   ASSERT_EQ(-1, action.GetIconIndex(1));