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

chrome/browser/extensions/api/extension_action/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 "build/build_config.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension_action.h"
@@ skipping 111 matching lines @@
   ASSERT_TRUE(RunExtensionTest("browser_action/no_icon")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
 #if defined (OS_MACOSX)
   // We need this on mac so we don't loose 2x representations from browser icon
   // in transformations gfx::ImageSkia -> NSImage -> gfx::ImageSkia.
   gfx::test::SetSupportedScaleFactorsTo1xAnd2x();
 #endif
 
+  // We should not be creating icons asynchronoulsy, so we don't need an

[Jeffrey Yasskin, 2012/09/17 20:18:39]

sp: asynchronoulsy

[tbarzic, 2012/09/17 22:06:10]

Done.

+  // observer.
+  ExtensionActionIconFactory icon_factory(extension,
+                                          extension->browser_action(),
+                                          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(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(0).ToSkBitmap()->getGenerationID());
 
   uint32_t action_icon_current_id = 0;
 
   ResultCatcher catcher;
 
   // Tell the extension to update the icon using ImageData object.
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_FALSE(
       action_icon.ToImageSkia()->HasRepresentation(ui::SCALE_FACTOR_200P));
 
   EXPECT_TRUE(ImagesAreEqualAtScale(
       AddBackgroundForViews(*action_icon.ToImageSkia()),
       *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
       ui::SCALE_FACTOR_100P));
 
   // Tell the extension to update the icon using path.
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_FALSE(
       action_icon.ToImageSkia()->HasRepresentation(ui::SCALE_FACTOR_200P));
 
   EXPECT_TRUE(ImagesAreEqualAtScale(
       AddBackgroundForViews(*action_icon.ToImageSkia()),
       *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
       ui::SCALE_FACTOR_100P));
 
   // Tell the extension to update the icon using dictionary of ImageData
   // objects.
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_TRUE(
       action_icon.ToImageSkia()->HasRepresentation(ui::SCALE_FACTOR_200P));
 
   EXPECT_TRUE(ImagesAreEqualAtScale(
       AddBackgroundForViews(*action_icon.ToImageSkia()),
       *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
       ui::SCALE_FACTOR_100P));
 
   // Tell the extension to update the icon using dictionary of paths.
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_TRUE(
       action_icon.ToImageSkia()->HasRepresentation(ui::SCALE_FACTOR_200P));
 
   EXPECT_TRUE(ImagesAreEqualAtScale(
       AddBackgroundForViews(*action_icon.ToImageSkia()),
       *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
       ui::SCALE_FACTOR_100P));
 
   // Tell the extension to update the icon using dictionary of ImageData
   // objects, but setting only size 19.
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_FALSE(
       action_icon.ToImageSkia()->HasRepresentation(ui::SCALE_FACTOR_200P));
 
   EXPECT_TRUE(ImagesAreEqualAtScale(
       AddBackgroundForViews(*action_icon.ToImageSkia()),
       *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
       ui::SCALE_FACTOR_100P));
 
   // Tell the extension to update the icon using dictionary of paths, but
   // setting only size 19.
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(0);
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
   EXPECT_FALSE(
       action_icon.ToImageSkia()->HasRepresentation(ui::SCALE_FACTOR_200P));
 
   EXPECT_TRUE(ImagesAreEqualAtScale(
       AddBackgroundForViews(*action_icon.ToImageSkia()),
       *GetBrowserActionsBar().GetIcon(0).ToImageSkia(),
       ui::SCALE_FACTOR_100P));
 
   // Tell the extension to update the icon using dictionary of ImageData
   // objects, but setting only size 38.
   GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  action_icon = extension->browser_action()->GetIcon(0);
+  action_icon = icon_factory.GetIcon(0);
 
   const gfx::ImageSkia* action_icon_skia = action_icon.ToImageSkia();
 
   EXPECT_FALSE(action_icon_skia->HasRepresentation(ui::SCALE_FACTOR_100P));
   EXPECT_TRUE(action_icon_skia->HasRepresentation(ui::SCALE_FACTOR_200P));
 
   action_icon_current_id = action_icon.ToSkBitmap()->getGenerationID();
   EXPECT_GT(action_icon_current_id, action_icon_last_id);
   action_icon_last_id = action_icon_current_id;
 
@@ skipping 358 matching lines @@
       GURL(extension->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 
   // Test the getters for a specific tab.
   ui_test_utils::NavigateToURL(browser(),
       GURL(extension->GetResourceURL("update2.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 }  // namespace