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 "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
+#include "ui/gfx/image/image_skia.h"
 
 using content::WebContents;
 using extensions::Extension;
 
 class BrowserActionApiTest : public ExtensionApiTest {
  public:
   BrowserActionApiTest() {}
   virtual ~BrowserActionApiTest() {}
 
  protected:
   BrowserActionTestUtil GetBrowserActionsBar() {
     return BrowserActionTestUtil(browser());
   }
 
   bool OpenPopup(int index) {
     ResultCatcher catcher;
     content::WindowedNotificationObserver popup_observer(
         content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
         content::NotificationService::AllSources());
     GetBrowserActionsBar().Press(index);
     popup_observer.Wait();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
     return GetBrowserActionsBar().HasPopup();
   }
+
+  // Verifies that icons gotten from actions bar and browser action have
+  // changed. Also checks if action icon has icon representation for 2x as
+  // expected.
+  void VerifyIconState(const Extension* extension,

[Jeffrey Yasskin, 2012/08/17 23:20:28]

Please use descriptive assertion names, so people reading the test don't always
have to come back to this definition to understand things. Sometimes you may
need to use 2 functions instead of 1 to give them each coherent meanings.

When a helper function EXPECT-fails, name it starting with "Expect".

[tbarzic, 2012/08/21 00:22:07]

ok, got rid of this function..

+                       bool has_2x_icon,
+                       uint32_t* last_bar_icon_id,
+                       uint32_t* last_action_icon_id) {
+    gfx::ImageSkia action_icon =
+        extension->browser_action()->GetIcon(0).AsImageSkia();
+
+    EXPECT_EQ(has_2x_icon,
+              action_icon.HasRepresentation(ui::SCALE_FACTOR_200P));
+
+    SkBitmap action_icon_bitmap =
+        action_icon.GetRepresentation(ui::SCALE_FACTOR_100P).sk_bitmap();
+
+    uint32_t bar_icon_id = GetBrowserActionsBar().GetIconID(0);
+
+    if (*last_action_icon_id > 0)
+      EXPECT_GT(action_icon_bitmap.getGenerationID(), *last_action_icon_id);

[Jeffrey Yasskin, 2012/08/17 23:20:28]

Please include a test that checks for icon equality, not just icon inequality.
BitmapsAreEqual() in ui/gfx/skia_util.h might be helpful.

[tbarzic, 2012/08/21 00:22:07]

yeah, I've stumbled upon that function on Friday, but I haven't had time to
changed the test ;)

+    if (*last_bar_icon_id > 0)
+      EXPECT_GT(bar_icon_id, *last_bar_icon_id);
+
+    // Update last icon ids so we can test next icons' ids against current
+    // icons.
+    *last_action_icon_id = action_icon_bitmap.getGenerationID();
+    *last_bar_icon_id = bar_icon_id;
+  }
 };
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
@@ skipping 32 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();
+  uint32_t action_icon_last_id = 0;
+  uint32_t bar_icon_last_id = 0;
+
+  ResultCatcher catcher;
+
+  // First, let's setup icon ids to some valid values..
+  GetBrowserActionsBar().Press(0);
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  VerifyIconState(extension, false, &bar_icon_last_id, &action_icon_last_id);
 
   // 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();
+  VerifyIconState(extension, false, &bar_icon_last_id, &action_icon_last_id);
 
   // 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());
+
+  VerifyIconState(extension, false, &bar_icon_last_id, &action_icon_last_id);
+
+  // Tell the extension to update the icon using setIcon({imageDataSet:...}).
+  GetBrowserActionsBar().Press(0);
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  VerifyIconState(extension, true, &bar_icon_last_id, &action_icon_last_id);
+
+  // Tell the extension to update the icon using setIcon({pathSet:...}).
+  GetBrowserActionsBar().Press(0);
+  ASSERT_TRUE(catcher.GetNextResult());
+
+  VerifyIconState(extension, true, &bar_icon_last_id, &action_icon_last_id);
 }
 
 // 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());
 }