[Extensions] Refactor extension action execution

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_action_runner.h"
 #include "chrome/browser/extensions/extension_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/sessions/session_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 34 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;
-    ExtensionActionAPI::Get(browser()->profile())->ExecuteExtensionAction(
-        extension, browser(), true);
+    ExtensionActionRunner::GetForWebContents(
+        browser()->tab_strip_model()->GetActiveWebContents())
+        ->RunAction(extension, 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::Get(browser()->profile())->ExecuteExtensionAction(
-        extension, browser(), true);
+    ExtensionActionRunner::GetForWebContents(
+        browser()->tab_strip_model()->GetActiveWebContents())
+        ->RunAction(extension, 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 104 matching lines @@
 
   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;
-    ExtensionActionAPI::Get(browser()->profile())->ExecuteExtensionAction(
-        extension, browser(), true);
+    ExtensionActionRunner::GetForWebContents(
+        browser()->tab_strip_model()->GetActiveWebContents())
+        ->RunAction(extension, true);
     EXPECT_TRUE(catcher.GetNextResult());
   }
 
   // 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