Update browserAction.setIcon and pageAction.setIcon for hidpi

chrome/browser/extensions/api/extension_action/page_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 "chrome/browser/extensions/browser_event_router.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/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/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 "ui/gfx/image/image_skia.h"
 
 using extensions::Extension;
 
+namespace {
+
+gfx::Image CreateNonEmptyImage() {
+  SkBitmap bitmap;
+  bitmap.setConfig(SkBitmap::kARGB_8888_Config, 16, 16);
+  bitmap.allocPixels();
+  return gfx::Image(bitmap);
+}
+
+}  // namespace
+
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {
   ASSERT_TRUE(test_server()->Start());
   ASSERT_TRUE(RunExtensionTest("page_action/basics")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
   {
     // Tell the extension to update the page action state.
     ResultCatcher catcher;
     ui_test_utils::NavigateToURL(browser(),
         GURL(extension->GetResourceURL("update.html")));
@@ skipping 128 matching lines @@
   // Simulate the page action being clicked.
   {
     ResultCatcher catcher;
     int tab_id =
         ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser()));
     ExtensionService* service = browser()->profile()->GetExtensionService();
     service->browser_event_router()->PageActionExecuted(
         browser()->profile(), *extension->page_action(), tab_id, "", 1);
     EXPECT_TRUE(catcher.GetNextResult());
   }
+
+  // Set icon by its index.
+  {
+    int tab_id =
+        ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser()));
+
+    // Set some icon so we can verify it gets cleaned up by setIconIndex.
+    extension->page_action()->SetIcon(tab_id, CreateNonEmptyImage());
+    ASSERT_FALSE(
+        extension->page_action()->GetExplicitlySetIcon(tab_id).empty());
+
+    // Currently, icon index should be set to 0.
+    ASSERT_EQ(0, extension->page_action()->GetIconIndex(tab_id));
+
+    ResultCatcher catcher;
+    ui_test_utils::NavigateToURL(browser(),
+        GURL(extension->GetResourceURL("set_icon_index.html")));
+    ASSERT_TRUE(catcher.GetNextResult());
+
+    // Check new value of icon index is as expected.
+    EXPECT_EQ(1, extension->page_action()->GetIconIndex(tab_id));
+    // Explicitly set icon should have been reset.
+    ASSERT_TRUE(
+        extension->page_action()->GetExplicitlySetIcon(tab_id).empty());
+  }
 }
 
 // Tests popups in page actions.
 // Flaky on the trybots. See http://crbug.com/96725.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_ShowPageActionPopup) {
   ASSERT_TRUE(RunExtensionTest("page_action/popup")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1));
@@ skipping 23 matching lines @@
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Getters) {
   ASSERT_TRUE(RunExtensionTest("page_action/getters")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
       GURL(extension->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 }