Update browserAction.setIcon and pageAction.setIcon for 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_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"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
+#include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_operations.h"
+#include "ui/gfx/skia_util.h"
 
 using content::WebContents;
 using extensions::Extension;
 
+namespace {
+
+// Views implementation of browser action button will return icon with set
+// background.
+gfx::ImageSkia AddBackgroundForViews(const gfx::ImageSkia& icon) {
+#if defined(TOOLKIT_VIEWS)
+  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+  gfx::ImageSkia bg = *rb.GetImageSkiaNamed(IDR_BROWSER_ACTION);
+  return gfx::ImageSkiaOperations::CreateSuperimposedImage(bg, icon);
+#endif
+
+  return icon;
+}
+
+bool ImagesAreEqual(const gfx::ImageSkia& i1, const gfx::ImageSkia& i2) {
+  SkBitmap bitmap1 =
+      i1.GetRepresentation(ui::SCALE_FACTOR_100P).sk_bitmap();
+  SkBitmap bitmap2 =
+      i2.GetRepresentation(ui::SCALE_FACTOR_100P).sk_bitmap();
+  return gfx::BitmapsAreEqual(bitmap1, bitmap2);
+}
+
 class BrowserActionApiTest : public ExtensionApiTest {
  public:
   BrowserActionApiTest() {}
   virtual ~BrowserActionApiTest() {}
 
  protected:
   BrowserActionTestUtil GetBrowserActionsBar() {
     return BrowserActionTestUtil(browser());
   }
 
@@ skipping 52 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
   ASSERT_TRUE(RunExtensionTest("browser_action/no_icon")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
   EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0));
 
-  // Set prev_id which holds the id of the previous image, and use it in the
-  // next test to see if the image changes.
-  uint32_t prev_id = extension->browser_action()->GetIcon(0).
-      ToSkBitmap()->getGenerationID();
+  gfx::Image action_icon = extension->browser_action()->GetIcon(0);
+  uint32_t action_icon_last_id = action_icon.AsBitmap().getGenerationID();

[Jeffrey Yasskin, 2012/08/21 20:10:38]

It might be nice to have one sanity-check here, of the form:
EXPECT_EQ(action_icon_last_id,
          extension->browser_action()->GetIcon(0).
          ToBitmap()->getGenerationID());
Otherwise it's possible that GetIcon returns an entirely new bitmap, which would
cause your assertions below to fail to test anything.

I'm suggesting ToBitmap because of the discussion at http://crbug.com/142930,
and because I don't think you need AsBitmap()'s empty behavior in this case.

[tbarzic, 2012/08/22 00:12:49]

Done.

+  uint32_t action_icon_current_id = 0;
+
+
+  ResultCatcher catcher;
 
   // Tell the extension to update the icon using setIcon({imageData:...}).
-  ResultCatcher catcher;
-  ui_test_utils::NavigateToURL(browser(),
-      GURL(extension->GetResourceURL("update.html")));
+  GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
 
-  // Test that we received the changes.
-  EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0));
-  EXPECT_NE(prev_id,
-            extension->browser_action()->GetIcon(0).
-            ToSkBitmap()->getGenerationID());
-  prev_id = extension->browser_action()->GetIcon(0).
-      ToSkBitmap()->getGenerationID();
+  action_icon = extension->browser_action()->GetIcon(0);
+
+  action_icon_current_id = action_icon.AsBitmap().getGenerationID();
+  EXPECT_GT(action_icon_current_id, action_icon_last_id);
+  action_icon_last_id = action_icon_current_id;
+
+  EXPECT_FALSE(
+      action_icon.AsImageSkia().HasRepresentation(ui::SCALE_FACTOR_200P));
+
+  EXPECT_TRUE(ImagesAreEqual(AddBackgroundForViews(action_icon.AsImageSkia()),
+                             GetBrowserActionsBar().GetIcon(0).AsImageSkia()));
 
   // Tell the extension to update the icon using setIcon({path:...}).
-  ui_test_utils::NavigateToURL(browser(),
-      GURL(extension->GetResourceURL("update2.html")));
+  GetBrowserActionsBar().Press(0);
   ASSERT_TRUE(catcher.GetNextResult());
-  EXPECT_TRUE(GetBrowserActionsBar().HasIcon(0));
-  EXPECT_NE(prev_id,
-            extension->browser_action()->GetIcon(0).
-            ToSkBitmap()->getGenerationID());
+
+  action_icon = extension->browser_action()->GetIcon(0);
+
+  action_icon_current_id = action_icon.AsBitmap().getGenerationID();
+  EXPECT_GT(action_icon_current_id, action_icon_last_id);
+  action_icon_last_id = action_icon_current_id;
+
+  EXPECT_FALSE(
+      action_icon.AsImageSkia().HasRepresentation(ui::SCALE_FACTOR_200P));
+
+  EXPECT_TRUE(ImagesAreEqual(AddBackgroundForViews(action_icon.AsImageSkia()),
+                             GetBrowserActionsBar().GetIcon(0).AsImageSkia()));
+
+  // Tell the extension to update the icon using setIcon({imageDataSet:...}).
+  GetBrowserActionsBar().Press(0);
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  action_icon = extension->browser_action()->GetIcon(0);
+
+  action_icon_current_id = action_icon.AsBitmap().getGenerationID();
+  EXPECT_GT(action_icon_current_id, action_icon_last_id);
+  action_icon_last_id = action_icon_current_id;
+
+  EXPECT_TRUE(
+      action_icon.AsImageSkia().HasRepresentation(ui::SCALE_FACTOR_200P));
+
+  EXPECT_TRUE(ImagesAreEqual(AddBackgroundForViews(action_icon.AsImageSkia()),
+                             GetBrowserActionsBar().GetIcon(0).AsImageSkia()));
+
+  // Tell the extension to update the icon using setIcon({pathSet:...}).
+  GetBrowserActionsBar().Press(0);
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  action_icon = extension->browser_action()->GetIcon(0);
+
+  action_icon_current_id = action_icon.AsBitmap().getGenerationID();
+  EXPECT_GT(action_icon_current_id, action_icon_last_id);
+  action_icon_last_id = action_icon_current_id;
+
+  EXPECT_TRUE(
+      action_icon.AsImageSkia().HasRepresentation(ui::SCALE_FACTOR_200P));
+
+  EXPECT_TRUE(ImagesAreEqual(AddBackgroundForViews(action_icon.AsImageSkia()),
+                             GetBrowserActionsBar().GetIcon(0).AsImageSkia()));
+
+  // Tell the extension to update the icon using setIcon({imageDataSet:...}),
+  // but setting only size 19.
+  GetBrowserActionsBar().Press(0);
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  action_icon = extension->browser_action()->GetIcon(0);
+
+  action_icon_current_id = action_icon.AsBitmap().getGenerationID();
+  EXPECT_GT(action_icon_current_id, action_icon_last_id);
+  action_icon_last_id = action_icon_current_id;
+
+  EXPECT_FALSE(
+      action_icon.AsImageSkia().HasRepresentation(ui::SCALE_FACTOR_200P));
+
+  EXPECT_TRUE(ImagesAreEqual(AddBackgroundForViews(action_icon.AsImageSkia()),
+                             GetBrowserActionsBar().GetIcon(0).AsImageSkia()));
+
+  // Tell the extension to update the icon using setIcon({pathSet:...}), but
+  // setting only size 19.
+  GetBrowserActionsBar().Press(0);
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  action_icon = extension->browser_action()->GetIcon(0);
+
+  action_icon_current_id = action_icon.AsBitmap().getGenerationID();
+  EXPECT_GT(action_icon_current_id, action_icon_last_id);
+  action_icon_last_id = action_icon_current_id;
+
+  EXPECT_FALSE(
+      action_icon.AsImageSkia().HasRepresentation(ui::SCALE_FACTOR_200P));
+
+  EXPECT_TRUE(ImagesAreEqual(AddBackgroundForViews(action_icon.AsImageSkia()),
+                             GetBrowserActionsBar().GetIcon(0).AsImageSkia()));
 }
 
 // This test is flaky as per http://crbug.com/74557.
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest,
                        DISABLED_TabSpecificBrowserActionState) {
   ASSERT_TRUE(RunExtensionTest("browser_action/tab_specific_state")) <<
       message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
@@ skipping 328 matching lines @@
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
       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