Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/common/extensions/manifest_tests/extension_manifests_scriptbadge_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_scriptbadge_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_scriptbadge_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_scriptbadge_unittest.cc
index 6b2c39d02fac821bd9bbafcc15c824d979840942..9bcead5fc757cdb8614f6c365f36e0505b0af239 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_scriptbadge_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_scriptbadge_unittest.cc
@@ -11,7 +11,7 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.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"
 
 namespace errors = extension_manifest_errors;
@@ -20,8 +20,8 @@ using extensions::Extension;
 
 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());
 }
 
 std::vector<Extension::InstallWarning> StripMissingFlagWarning(
@@ -47,7 +47,7 @@ TEST_F(ExtensionManifestTest, ScriptBadgeBasic) {
   EXPECT_TRUE(extension->script_badge()->HasPopup(
       ExtensionAction::kDefaultTabId));
   EXPECT_TRUE(ImagesAreEqual(
-      ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+      *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           IDR_EXTENSIONS_FAVICON),
       extension->script_badge()->GetIcon(ExtensionAction::kDefaultTabId)));
   EXPECT_EQ("icon16.png", extension->script_badge()->default_icon_path());
@@ -70,7 +70,7 @@ TEST_F(ExtensionManifestTest, ScriptBadgeExplicitTitleAndIconsIgnored) {
   EXPECT_EQ("my extension", extension->script_badge()->GetTitle(
       ExtensionAction::kDefaultTabId));
   EXPECT_TRUE(ImagesAreEqual(
-      ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+      *ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
           IDR_EXTENSIONS_FAVICON),
       extension->script_badge()->GetIcon(ExtensionAction::kDefaultTabId)));
   EXPECT_EQ("icon16.png", extension->script_badge()->default_icon_path());
@@ -87,7 +87,7 @@ TEST_F(ExtensionManifestTest, ScriptBadgeIconFallsBackToPuzzlePiece) {
   EXPECT_EQ("", extension->script_badge()->default_icon_path())
       << "Should not fall back to the 64px icon.";
   EXPECT_FALSE(extension->script_badge()->GetIcon(
-      ExtensionAction::kDefaultTabId).IsEmpty())
+      ExtensionAction::kDefaultTabId).empty())
       << "Should set the puzzle piece as the default, but there's no way "
       << "to assert in a unittest what the image looks like.";
 }