Move icon fallbacks into ExtensionAction.

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 f8e071a5035c9bf4d898bee72de4bd7c0c492693..8ac32a2bb925b7a7d765569c4c86e72b474c9819 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_scriptbadge_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_scriptbadge_unittest.cc
@@ -7,14 +7,21 @@
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_switch_utils.h"
-#include "testing/gtest/include/gtest/gtest.h"
+#include "grit/theme_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image.h"
+#include "ui/gfx/skia_util.h"
 
 namespace errors = extension_manifest_errors;
 namespace switch_utils = extensions::switch_utils;
 using extensions::Extension;
 
+static bool ImagesAreEqual(const gfx::Image& i1, const gfx::Image& i2) {

[not at google - send to devlin, 2012/07/26 02:29:44]

ditto

[Jeffrey Yasskin, 2012/07/26 21:11:47]

Done.

+  return gfx::BitmapsAreEqual(*i1.ToSkBitmap(), *i2.ToSkBitmap());
+}
+
 std::vector<Extension::InstallWarning> StripMissingFlagWarning(
     const std::vector<Extension::InstallWarning>& install_warnings) {
   std::vector<Extension::InstallWarning> result;
@@ -37,8 +44,12 @@ TEST_F(ExtensionManifestTest, ScriptBadgeBasic) {
       ExtensionAction::kDefaultTabId));
   EXPECT_TRUE(extension->script_badge()->HasPopup(
       ExtensionAction::kDefaultTabId));
-  EXPECT_TRUE(extension->script_badge()->GetIcon(
-      ExtensionAction::kDefaultTabId).isNull());
+  ExtensionAction::PathToIconCache empty_cache;
+  EXPECT_TRUE(ImagesAreEqual(
+      ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+          IDR_EXTENSIONS_FAVICON),
+      extension->script_badge()->GetIcon(
+          ExtensionAction::kDefaultTabId, empty_cache)));
   EXPECT_EQ("icon16.png", extension->script_badge()->default_icon_path());
 }
 
@@ -58,8 +69,12 @@ TEST_F(ExtensionManifestTest, ScriptBadgeExplicitTitleAndIconsIgnored) {
                       errors::kScriptBadgeIconIgnored)));
   EXPECT_EQ("my extension", extension->script_badge()->GetTitle(
       ExtensionAction::kDefaultTabId));
-  EXPECT_TRUE(extension->script_badge()->GetIcon(
-      ExtensionAction::kDefaultTabId).isNull());
+  ExtensionAction::PathToIconCache empty_cache;
+  EXPECT_TRUE(ImagesAreEqual(
+      ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+          IDR_EXTENSIONS_FAVICON),
+      extension->script_badge()->GetIcon(
+          ExtensionAction::kDefaultTabId, empty_cache)));
   EXPECT_EQ("icon16.png", extension->script_badge()->default_icon_path());
 }
 
@@ -73,8 +88,9 @@ TEST_F(ExtensionManifestTest, ScriptBadgeIconFallsBackToPuzzlePiece) {
 
   EXPECT_EQ("", extension->script_badge()->default_icon_path())
       << "Should not fall back to the 64px icon.";
+  ExtensionAction::PathToIconCache empty_cache;
   EXPECT_FALSE(extension->script_badge()->GetIcon(
-      ExtensionAction::kDefaultTabId).isNull())
+      ExtensionAction::kDefaultTabId, empty_cache).IsEmpty())
       << "Should set the puzzle piece as the default, but there's no way "
       << "to assert in a unittest what the image looks like.";
 }