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

chrome/browser/extensions/api/extension_action/page_action_apitest.cc

Index: chrome/browser/extensions/api/extension_action/page_action_apitest.cc
diff --git a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
index c7d54226f6aa4a9289fde9694711e30be7711d0d..a245e06a5c36553256325e6f81f5237a128562c7 100644
--- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc
@@ -15,11 +15,26 @@
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
+#include "chrome/common/extensions/extension_icon_factory_delegate.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/image/image_skia.h"
 
 using extensions::Extension;
+using ::testing::_;
+
+namespace {
+
+class MockActionIconFactory : public ExtensionIconFactoryDelegate {
+ public:
+  virtual ~MockActionIconFactory() {}
+
+  MOCK_METHOD2(GetIcon, gfx::ImageSkia(const ExtensionIconSet* icon_set,
+                                       int desired_size));
+};
+
+}  // namespace
 
 namespace {
 
@@ -71,10 +86,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
+  MockActionIconFactory mock_icon_factory;
+  EXPECT_CALL(mock_icon_factory, GetIcon(_, _)).Times(0);
+
   // Test that we received the changes.
   tab_id = chrome::GetActiveTabContents(browser())->session_tab_helper()->
       session_id().id();
-  EXPECT_FALSE(action->GetIcon(tab_id).IsEmpty());
+  EXPECT_FALSE(action->GetIcon(tab_id, &mock_icon_factory).IsEmpty());
 }
 
 // Test that calling chrome.pageAction.setPopup() can enable a popup.