Handle more scale factors for extension Browser Action icons

chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc

Index: chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc
diff --git a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc
index 4693a943bec721d6f598c53a22660a5a7211ed6b..539477b64c8b4447ac754c116001bc857780ae53 100644
--- a/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc
+++ b/chrome/common/extensions/api/extension_action/browser_action_manifest_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/extension_icon_set.h"
@@ -60,23 +61,27 @@ TEST_F(BrowserActionManifestTest,
   const ExtensionIconSet& icons = browser_action_info->default_icon;
 
   EXPECT_EQ(1u, icons.map().size());
-  EXPECT_EQ("icon.png", icons.Get(38, ExtensionIconSet::MATCH_EXACTLY));
+  EXPECT_EQ("icon.png", icons.Get(extension_misc::EXTENSION_ICON_GIGANTOR,
+                                  ExtensionIconSet::MATCH_EXACTLY));
 }
 
 TEST_F(BrowserActionManifestTest,
        BrowserActionManifestIcons_DictDefaultIcon) {
+  // Arbitrary sizes should be allowed (useful for various scale factors).
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
-      .SetManifest(DictionaryBuilder()
-                   .Set("name", "Dictionary default icon")
-                   .Set("version", "1.0.0")
-                   .Set("manifest_version", 2)
-                   .Set("browser_action", DictionaryBuilder()
-                       .Set("default_icon", DictionaryBuilder()
-                           .Set("19", "icon19.png")
-                           .Set("24", "icon24.png")  // Should be ignored.
-                           .Set("38", "icon38.png"))))
-      .Build();
+          .SetManifest(
+              DictionaryBuilder()
+                  .Set("name", "Dictionary default icon")
+                  .Set("version", "1.0.0")
+                  .Set("manifest_version", 2)
+                  .Set("browser_action",
+                       DictionaryBuilder().Set("default_icon",
+                                               DictionaryBuilder()
+                                                   .Set("19", "icon19.png")
+                                                   .Set("24", "icon24.png")
+                                                   .Set("38", "icon38.png"))))
+          .Build();
 
   ASSERT_TRUE(extension.get());
   const ActionInfo* browser_action_info =
@@ -86,9 +91,10 @@ TEST_F(BrowserActionManifestTest,
 
   const ExtensionIconSet& icons = browser_action_info->default_icon;
 
-  // 24px icon should be ignored.
-  EXPECT_EQ(2u, icons.map().size());
+  // 24px icon should be included.
+  EXPECT_EQ(3u, icons.map().size());
   EXPECT_EQ("icon19.png", icons.Get(19, ExtensionIconSet::MATCH_EXACTLY));
+  EXPECT_EQ("icon24.png", icons.Get(24, ExtensionIconSet::MATCH_EXACTLY));
   EXPECT_EQ("icon38.png", icons.Get(38, ExtensionIconSet::MATCH_EXACTLY));
 }