Uncouple ActiveScriptController from LocationBarController

chrome/browser/extensions/api/extension_action/extension_action_api.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 "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/active_script_controller.h"
@@ skipping 157 matching lines @@
       browser->tab_strip_model()->GetActiveWebContents();
   if (!web_contents)
     return ExtensionAction::ACTION_NONE;
 
   int tab_id = SessionTabHelper::IdForTab(web_contents);
 
   ActiveScriptController* active_script_controller =
       ActiveScriptController::GetForWebContents(web_contents);
   bool has_pending_scripts = false;
   if (active_script_controller &&
-      active_script_controller->GetActionForExtension(extension)) {
+      active_script_controller->WantsToRun(extension)) {
     has_pending_scripts = true;
   }
 
   // Grant active tab if appropriate.
   if (grant_active_tab_permissions) {
     TabHelper::FromWebContents(web_contents)->active_tab_permission_granter()->
         GrantIfRequested(extension);
   }
 
   // If this was a request to run a script, it will have been run once active
@@ skipping 453 matching lines @@
   if (host->extension_host_type() != VIEW_TYPE_EXTENSION_POPUP ||
       host->extension()->id() != extension_->id())
     return;
 
   SendResponse(true);
   response_sent_ = true;
   registrar_.RemoveAll();
 }
 
 }  // namespace extensions