Revert 273866 "Block content scripts from executing until user g..."

trunk/src/extensions/common/permissions/permissions_data.cc

 // Copyright (c) 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.
 
 #include "extensions/common/permissions/permissions_data.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 566 matching lines @@
     const Extension* extension) {
   return RequiresActionForScriptExecution(extension, -1, GURL());
 }
 
 // static
 bool PermissionsData::RequiresActionForScriptExecution(
     const Extension* extension,
     int tab_id,
     const GURL& url) {
   // For now, the user should be notified when an extension with all hosts
-  // permission tries to execute a script on a page. Exceptions for policy-
-  // enabled and component extensions, and extensions which are whitelisted to
-  // execute scripts everywhere.
+  // permission tries to execute a script on a page, with exceptions for policy-
+  // enabled and component extensions. If this doesn't meet those criteria,
+  // return immediately.
   if (!extension->ShouldDisplayInExtensionSettings() ||
       Manifest::IsPolicyLocation(extension->location()) ||
       Manifest::IsComponentLocation(extension->location()) ||
-      CanExecuteScriptEverywhere(extension) ||
       !ShouldWarnAllHosts(extension)) {
     return false;
   }
 
   // If the extension has explicit permission to run on the given tab, then
   // we don't need to alert the user.
   if (HasTabSpecificPermissionToExecuteScript(extension, tab_id, url))
     return false;
 
   return true;
@@ skipping 49 matching lines @@
   initial_required_permissions_.reset();
   initial_optional_permissions_.reset();
 }
 
 bool PermissionsData::ShouldWarnAllHosts(const Extension* extension) {
   base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
   return PermissionsData::GetActivePermissions(extension)->ShouldWarnAllHosts();
 }
 
 }  // namespace extensions