Uncouple ActiveScriptController from LocationBarController

chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm

 // Copyright 2013 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.
 
 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/extensions/active_script_controller.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
@@ skipping 102 matching lines @@
       extension_).is_valid()];
 
   // Separator.
   [menu addItem:[NSMenuItem separatorItem]];
 
   // Always Run. Only displayed if there is an active script injection action.
   content::WebContents* activeTab =
       browser_->tab_strip_model()->GetActiveWebContents();
   if (activeTab &&
       extensions::ActiveScriptController::GetForWebContents(activeTab)
-          ->HasActiveScriptAction(extension_)) {
+          ->WantsToRun(extension_)) {
     item = [menu addItemWithTitle:
                 l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_ALWAYS_RUN)
                            action:@selector(onAlwaysRun:)
                     keyEquivalent:@""];
     [item setTarget:self];
   }
 
   // Options.
   item = [menu addItemWithTitle:
               l10n_util::GetNSStringWithFixup(IDS_EXTENSIONS_OPTIONS_MENU_ITEM)
@@ skipping 115 matching lines @@
     return;
 
   [ExtensionPopupController showURL:url
                           inBrowser:browser_
                          anchoredAt:popupPoint
                       arrowLocation:info_bubble::kTopRight
                             devMode:YES];
 }
 
 @end