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

chrome/browser/ui/webui/extensions/extension_settings_handler.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/ui/webui/extensions/extension_settings_handler.h"
 
 #include "apps/app_load_service.h"
 #include "apps/saved_files_service.h"
 #include "base/auto_reset.h"
 #include "base/base64.h"
@@ skipping 320 matching lines @@
       dependent_entry->SetString("id", (*i)->id());
       dependent_entry->SetString("name", (*i)->name());
       dependents_list->Append(dependent_entry);
     }
   }
   extension_data->Set("dependentExtensions", dependents_list);
 
   // Extensions only want all URL access if:
   // - The feature is enabled for the given extension.
   // - 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",
       util::AllowedScriptingOnAllUrls(
           extension->id(),
           extension_service_->GetBrowserContext()));
 
   base::string16 location_text;
   if (extension->location() == Manifest::INTERNAL &&
       !ManifestURL::UpdatesFromGallery(extension)) {
@@ skipping 1173 matching lines @@
     extension_service_->EnableExtension(extension_id);
   } else {
     ExtensionErrorReporter::GetInstance()->ReportError(
         base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
         true);  // Be noisy.
   }
   requirements_checker_.reset();
 }
 
 }  // namespace extensions