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

chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.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 "base/command_line.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
+#include "testing/gmock/include/gmock/gmock.h"
 
 // These are a mash-up of the tests from from page_actions_apitest.cc and
 // browser_actions_apitest.cc.
 
 using extensions::Extension;
+using ::testing::_;
 
 namespace {
 
+class MockActionIconFactory : public ExtensionAction::IconFactory {
+ public:
+  virtual ~MockActionIconFactory() {}
+
+  MOCK_METHOD2(GetIcon, gfx::ImageSkia(const ExtensionIconSet* icon_set,
+                                       ExtensionAction::Type type));
+};
+
 class PageAsBrowserActionApiTest : public ExtensionApiTest {
  public:
   PageAsBrowserActionApiTest() {}
   virtual ~PageAsBrowserActionApiTest() {}
 
   void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableScriptBadges);
   }
 
@@ skipping 46 matching lines @@
   }
 
   {
     // Tell the extension to update the page action state again.
     ResultCatcher catcher;
     ui_test_utils::NavigateToURL(browser(),
         GURL(extension->GetResourceURL("update2.html")));
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
+  MockActionIconFactory mock_icon_factory;
+  EXPECT_CALL(mock_icon_factory, GetIcon(_, _)).Times(0);
+
   // Test that we received the changes.
-  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.
 IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, AddPopup) {
   // Load the extension, which has no default popup.
   ASSERT_TRUE(RunExtensionTest("page_action/add_popup")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   int tab_id = ExtensionTabUtil::GetTabId(
@@ skipping 70 matching lines @@
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
       GURL(extension->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 }