[Extensions] Refactor extension action execution

chrome/browser/extensions/extension_action_runner_browsertest.cc

 // Copyright 2014 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 <stddef.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/files/file_path.h"
@@ skipping 243 matching lines @@
   // script has *not* already executed.
   if (inject_success_listener_->was_satisfied()) {
     return testing::AssertionFailure() << name_
                                        << "'s script ran without permission.";
   }
 
   // If we reach this point, we should always want to run.
   DCHECK(wants_to_run);
 
   // Grant permission by clicking on the extension action.
-  runner->OnClicked(extension_);
+  runner->RunAction(extension_, true);
 
   // Now, the extension should be able to inject the script.
   inject_success_listener_->WaitUntilSatisfied();
 
   // The extension should no longer want to run.
   wants_to_run = WantsToRun();
   if (wants_to_run) {
     return testing::AssertionFailure()
            << "Extension " << name_ << " still wants to run after injecting.";
   }
@@ skipping 89 matching lines @@
   // We should have pending requests for extension1, but not the removed
   // extension2.
   EXPECT_TRUE(action_runner->WantsToRun(extension1));
   EXPECT_FALSE(action_runner->WantsToRun(extension2));
 
   // We should still be able to run the request for extension1.
   ExtensionTestMessageListener inject_success_listener(
       new ExtensionTestMessageListener(kInjectSucceeded,
                                        false /* won't reply */));
   inject_success_listener.set_extension_id(extension1->id());
-  action_runner->OnClicked(extension1);
+  action_runner->RunAction(extension1, true);
   inject_success_listener.WaitUntilSatisfied();
 }
 
 // Test that granting the extension all urls permission allows it to run on
 // pages, and that the permission update is sent to existing renderers.
 IN_PROC_BROWSER_TEST_F(ExtensionActionRunnerBrowserTest,
                        GrantExtensionAllUrlsPermission) {
   // Loadup an extension and navigate.
   const Extension* extension = CreateExtension(ALL_HOSTS, CONTENT_SCRIPT);
   ASSERT_TRUE(extension);
@@ skipping 69 matching lines @@
 
   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL("/extensions/test_file.html"));
 
   for (size_t i = 0u; i < arraysize(testers); ++i)
     EXPECT_TRUE(testers[i].Verify()) << kExtensionNames[i];
 }
 
 }  // namespace extensions