Change browser/page action default icon defined in manifest to support hidpi.

chrome/common/extensions/extension_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension.h"
 
 #include "base/format_macros.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 28 matching lines @@
 using extensions::PermissionSet;
 using extensions::SocketPermission;
 using extensions::SocketPermissionData;
 
 namespace keys = extension_manifest_keys;
 namespace values = extension_manifest_values;
 namespace errors = extension_manifest_errors;
 
 namespace {
 
+std::string GetPageActionIconPathAt(const ExtensionAction* action, int index) {
+  const ExtensionIconSet* icon_set = action->page_action_icons()[index];
+  return icon_set->Get(extension_misc::EXTENSION_ICON_ACTION,
+                       ExtensionIconSet::MATCH_EXACTLY);
+}
+
 void CompareLists(const std::vector<std::string>& expected,
                   const std::vector<std::string>& actual) {
   ASSERT_EQ(expected.size(), actual.size());
 
   for (size_t i = 0; i < expected.size(); ++i) {
     EXPECT_EQ(expected[i], actual[i]);
   }
 }
 
 static scoped_refptr<Extension> LoadManifestUnchecked(
@@ skipping 164 matching lines @@
   const std::string name("MyExtensionActionName");
   std::string img1("image1.png");
   std::string img2("image2.png");
 
   action = LoadAction("page_action.json");
   ASSERT_TRUE(NULL != action.get());
   ASSERT_EQ(id, action->id());
 
   // No title, so fall back to name.
   ASSERT_EQ(name, action->GetTitle(1));
-  ASSERT_EQ(2u, action->icon_paths()->size());
-  ASSERT_EQ(img1, (*action->icon_paths())[0]);
-  ASSERT_EQ(img2, (*action->icon_paths())[1]);
+  ASSERT_EQ(2u, action->page_action_icons().size());
+  ASSERT_EQ(img1, GetPageActionIconPathAt(action.get(), 0));
+  ASSERT_EQ(img2, GetPageActionIconPathAt(action.get(), 1));
 
   // Same test with explicitly set type.
   action = LoadAction("page_action_type.json");
   ASSERT_TRUE(NULL != action.get());
 
   // Try an action without id key.
   action = LoadAction("page_action_no_id.json");
   ASSERT_TRUE(NULL != action.get());
 
   // Then try without the name key. It's optional, so no error.
   action = LoadAction("page_action_no_name.json");
   ASSERT_TRUE(NULL != action.get());
   ASSERT_TRUE(action->GetTitle(1).empty());
 
   // Then try without the icon paths key.
   action = LoadAction("page_action_no_icon.json");
   ASSERT_TRUE(NULL != action.get());
 
   // Now test that we can parse the new format for page actions.
   const std::string kTitle("MyExtensionActionTitle");
   const std::string kIcon("image1.png");
   const std::string kPopupHtmlFile("a_popup.html");
 
   action = LoadAction("page_action_new_format.json");
   ASSERT_TRUE(action.get());
   ASSERT_EQ(kTitle, action->GetTitle(1));
-  ASSERT_EQ(0u, action->icon_paths()->size());
+  ASSERT_EQ(0u, action->page_action_icons().size());
 
   // Invalid title should give an error even with a valid name.
   LoadActionAndExpectError("page_action_invalid_title.json",
       errors::kInvalidPageActionDefaultTitle);
 
   // Invalid name should give an error only with no title.
   action = LoadAction("page_action_invalid_name.json");
   ASSERT_TRUE(NULL != action.get());
   ASSERT_EQ(kTitle, action->GetTitle(1));
 
@@ skipping 934 matching lines @@
 
 TEST(ExtensionTest, GetSyncTypeExtensionWithTwoPlugins) {
   scoped_refptr<Extension> extension(
       MakeSyncTestExtension(EXTENSION, GURL(), GURL(),
                             Extension::INTERNAL, 2, FilePath(),
                             Extension::NO_FLAGS));
   if (extension)
     EXPECT_EQ(extension->GetSyncType(), Extension::SYNC_TYPE_NONE);
 }
 #endif // !defined(OS_CHROMEOS)