[Extensions] Enable the scripts-require-action feature based on all-urls pref

chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
index 210867de012130b6bcbab9f3e072649490155074..52265bf216dfe015bb62abc25f15251ceb9734d6 100644
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc
@@ -340,10 +340,10 @@ base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
   // - The extension has access to enough urls that we can't just let it run
   //   on those specified in the permissions.

[not at google - send to devlin, 2015/02/06 00:26:56]

The comment and/or this variable name need updating. "Wants" isn't quite the
meaning here.

[Devlin, 2015/02/06 18:58:43]

Done.

   bool wants_all_urls =
-      util::ScriptsMayRequireActionForExtension(extension) &&
-      (extension->permissions_data()->HasWithheldImpliedAllHosts() ||
-       util::AllowedScriptingOnAllUrls(
-           extension->id(), extension_service_->GetBrowserContext()));
+      (FeatureSwitch::scripts_require_action()->IsEnabled() &&
+       util::ScriptsMayRequireActionForExtension(
+           extension, extension->permissions_data()->active_permissions())) ||
+      extension->permissions_data()->HasWithheldImpliedAllHosts();
   extension_data->SetBoolean("wantsAllUrls", wants_all_urls);
   extension_data->SetBoolean(
       "allowAllUrls",