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..99d05aa75d2c2c16a9ac292c24ebb1504306ff05 100644
--- a/chrome/common/extensions/extension_action_unittest.cc
+++ b/chrome/common/extensions/extension_action_unittest.cc
@@ -13,7 +13,7 @@
 #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"
 
@@ -65,7 +65,7 @@ TEST_F(ExtensionActionTest, Title) {
 
 TEST_F(ExtensionActionTest, Icon) {
   gfx::Image puzzle_piece =
-      ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+     ui::ResourceBundle::GetSharedInstance().GetImageNamed(

[Jeffrey Yasskin, 2012/08/09 21:39:04]

4-space indent, right?

[tbarzic, 2012/08/10 06:24:08]

Done.

           IDR_EXTENSIONS_FAVICON);
   gfx::Image icon1 = LoadIcon("icon1.png");
   gfx::Image icon2 = LoadIcon("icon2.png");
@@ -77,11 +77,11 @@ 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);
   ASSERT_TRUE(ImagesAreEqual(icon1, action.GetIcon(1)));
   ASSERT_TRUE(ImagesAreEqual(icon2, action.GetIcon(100)));
 }