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 211 matching lines @@
   const std::string id("MyExtensionActionId");
   const std::string name("MyExtensionActionName");
   std::string img1("image1.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(img1, action->default_icon_path());
+  ASSERT_EQ(img1,
+            action->default_icon()->Get(extension_misc::EXTENSION_ICON_ACTION,
+                                        ExtensionIconSet::MATCH_EXACTLY));
 
   // 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_FALSE(action->default_icon_path().empty());
+  ASSERT_TRUE(action->default_icon());
 
   // 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 935 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)