Consolidate ExtensionAction execution code

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/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_icon_factory.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 40 matching lines @@
   // Test that we received the changes.
   int tab_id = SessionTabHelper::FromWebContents(
       browser()->tab_strip_model()->GetActiveWebContents())->session_id().id();
   ExtensionAction* action = GetPageAction(*extension);
   ASSERT_TRUE(action);
   EXPECT_EQ("Modified", action->GetTitle(tab_id));
 
   {
     // Simulate the page action being clicked.
     ResultCatcher catcher;
-    int tab_id = ExtensionTabUtil::GetTabId(
-        browser()->tab_strip_model()->GetActiveWebContents());
-    ExtensionActionAPI::PageActionExecuted(
-        browser()->profile(), *action, tab_id, std::string(), 0);
+    ExtensionActionAPI::Get(browser()->profile())->ExecuteExtensionAction(
+        extension, browser(), true);
     EXPECT_TRUE(catcher.GetNextResult());
   }
 
   {
     // Tell the extension to update the page action state again.
     ResultCatcher catcher;
     ui_test_utils::NavigateToURL(browser(),
         GURL(extension->GetResourceURL("update2.html")));
     ASSERT_TRUE(catcher.GetNextResult());
   }
@@ skipping 21 matching lines @@
   ExtensionAction* page_action = GetPageAction(*extension);
   ASSERT_TRUE(page_action)
       << "Page action test extension should have a page action.";
 
   ASSERT_FALSE(page_action->HasPopup(tab_id));
 
   // Simulate the page action being clicked.  The resulting event should
   // install a page action popup.
   {
     ResultCatcher catcher;
-    ExtensionActionAPI::PageActionExecuted(
-        browser()->profile(), *page_action, tab_id, std::string(), 1);
+    ExtensionActionAPI::Get(browser()->profile())->ExecuteExtensionAction(
+        extension, browser(), true);
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   ASSERT_TRUE(page_action->HasPopup(tab_id))
       << "Clicking on the page action should have caused a popup to be added.";
 
   ASSERT_STREQ("/a_popup.html",
                page_action->GetPopupUrl(tab_id).path().c_str());
 
   // Now change the popup from a_popup.html to a_second_popup.html .
@@ skipping 90 matching lines @@
   ASSERT_TRUE(RunExtensionTest("trigger_actions/page_action")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   // Page action icon is displayed when a tab is created.
   ui_test_utils::NavigateToURL(browser(),
                                test_server()->GetURL("files/simple.html"));
   chrome::NewTab(browser());
   browser()->tab_strip_model()->ActivateTabAt(0, true);
 
+  // Give the extension time to show the page action on the tab.
+  WaitForPageActionVisibilityChangeTo(1);
+
   ExtensionAction* page_action = GetPageAction(*extension);
   ASSERT_TRUE(page_action);
 
+  WebContents* tab =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  ASSERT_TRUE(tab);
+
+  EXPECT_TRUE(page_action->GetIsVisible(ExtensionTabUtil::GetTabId(tab)));
+
   {
     // Simulate the page action being clicked.
     ResultCatcher catcher;
-    int tab_id = ExtensionTabUtil::GetTabId(
-        browser()->tab_strip_model()->GetActiveWebContents());
-    ExtensionActionAPI::PageActionExecuted(
-        browser()->profile(), *page_action, tab_id, std::string(), 0);
+    ExtensionActionAPI::Get(browser()->profile())->ExecuteExtensionAction(
+        extension, browser(), true);
     EXPECT_TRUE(catcher.GetNextResult());
   }
 
-  WebContents* tab =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_TRUE(tab != NULL);
-
   // Verify that the browser action turned the background color red.
   const std::string script =
       "window.domAutomationController.send(document.body.style."
       "backgroundColor);";
   std::string result;
   EXPECT_TRUE(content::ExecuteScriptAndExtractString(tab, script, &result));
   EXPECT_EQ(result, "red");
 }
 
 }  // namespace
 }  // namespace extensions