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

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

Index: chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
index 5844901e376a7d3998d6b306c2f76b9e5d0bd6a1..85b6bc9682d9549818e03eba0650521be31e87b3 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc
@@ -9,6 +9,7 @@
 #endif
 
 #include "chrome/browser/extensions/browser_action_test_util.h"
+#include "chrome/browser/extensions/extension_action_icon_factory.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
@@ -25,6 +26,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "grit/theme_resources.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
@@ -36,8 +38,10 @@
 #include "ui/gfx/image/image_unittest_util.h"
 #endif
 
+using content::BrowserThread;
 using content::WebContents;
 using extensions::Extension;
+using ::testing::_;
 
 namespace {
 
@@ -140,17 +144,22 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   gfx::test::SetSupportedScaleFactorsTo1xAnd2x();
 #endif
 
+  // We should not be creating icons asynchronoulsy, so we don't need an
+  // observer.
+  ExtensionActionIconFactory icon_factory(extension, NULL);
+
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
   EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0));
 
-  gfx::Image action_icon = extension->browser_action()->GetIcon(0);
+  gfx::Image action_icon =
+      icon_factory.GetIcon(extension->browser_action(), 0);
   uint32_t action_icon_last_id = action_icon.ToSkBitmap()->getGenerationID();
 
   // Let's check that |GetIcon| doesn't always return bitmap with new id.
   ASSERT_EQ(action_icon_last_id,
-            extension->browser_action()->GetIcon(0).ToSkBitmap()->
-            getGenerationID());
+            icon_factory.GetIcon(extension->browser_action(), 0).ToSkBitmap()->
+                getGenerationID());
 
   uint32_t action_icon_current_id = 0;
 
@@ -160,7 +169,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(extension->browser_action(), 0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
@@ -178,7 +187,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(extension->browser_action(), 0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
@@ -197,7 +206,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(extension->browser_action(), 0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
@@ -215,7 +224,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(extension->browser_action(), 0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
@@ -234,7 +243,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(extension->browser_action(), 0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
@@ -253,7 +262,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(extension->browser_action(), 0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
@@ -272,7 +281,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(extension->browser_action(), 0);
 
   const gfx::ImageSkia* action_icon_skia = action_icon.ToImageSkia();