Generalize ExtensionIconSet to store icon paths for custom size sets

chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc
index 23c05fde7da8407951f04a6c32f30a319bf5aff5..352be04769c62f284b0f1ed6b2cd531d89105263 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_icon_unittest.cc
@@ -5,45 +5,45 @@
 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
 
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST_F(ExtensionManifestTest, NormalizeIconPaths) {
   scoped_refptr<extensions::Extension> extension(
       LoadAndExpectSuccess("normalize_icon_paths.json"));
   EXPECT_EQ("16.png", extension->icons().Get(
-      ExtensionIconSet::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_EXACTLY));
+      extension_misc::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("48.png", extension->icons().Get(
-      ExtensionIconSet::EXTENSION_ICON_MEDIUM,
+      extension_misc::EXTENSION_ICON_MEDIUM,
       ExtensionIconSet::MATCH_EXACTLY));
 }
 
 TEST_F(ExtensionManifestTest, InvalidIconSizes) {
   scoped_refptr<extensions::Extension> extension(
       LoadAndExpectSuccess("init_ignored_icon_size.json"));
-  EXPECT_EQ("", extension->icons().Get(
-      static_cast<ExtensionIconSet::Icons>(300),
-      ExtensionIconSet::MATCH_EXACTLY));
+  EXPECT_EQ("",
+            extension->icons().Get(300, ExtensionIconSet::MATCH_EXACTLY));
 }
 
 TEST_F(ExtensionManifestTest, ValidIconSizes) {
   scoped_refptr<extensions::Extension> extension(
       LoadAndExpectSuccess("init_valid_icon_size.json"));
   EXPECT_EQ("16.png", extension->icons().Get(
-      ExtensionIconSet::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_EXACTLY));
+      extension_misc::EXTENSION_ICON_BITTY, ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("24.png", extension->icons().Get(
-      ExtensionIconSet::EXTENSION_ICON_SMALLISH,
+      extension_misc::EXTENSION_ICON_SMALLISH,
       ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("32.png", extension->icons().Get(
-      ExtensionIconSet::EXTENSION_ICON_SMALL, ExtensionIconSet::MATCH_EXACTLY));
+      extension_misc::EXTENSION_ICON_SMALL, ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("48.png", extension->icons().Get(
-      ExtensionIconSet::EXTENSION_ICON_MEDIUM,
+      extension_misc::EXTENSION_ICON_MEDIUM,
       ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("128.png", extension->icons().Get(
-      ExtensionIconSet::EXTENSION_ICON_LARGE, ExtensionIconSet::MATCH_EXACTLY));
+      extension_misc::EXTENSION_ICON_LARGE, ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("256.png", extension->icons().Get(
-      ExtensionIconSet::EXTENSION_ICON_EXTRA_LARGE,
+      extension_misc::EXTENSION_ICON_EXTRA_LARGE,
       ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("512.png", extension->icons().Get(
-      ExtensionIconSet::EXTENSION_ICON_GIGANTOR,
+      extension_misc::EXTENSION_ICON_GIGANTOR,
       ExtensionIconSet::MATCH_EXACTLY));
 }