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

trunk/src/chrome/browser/extensions/active_script_controller.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_
 #define CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 44 matching lines @@
   void RequestScriptInjection(const Extension* extension,
                               int page_id,
                               const base::Closure& callback);
 
   // Notifies the ActiveScriptController that an extension has been granted
   // active tab permissions. This will run any pending injections for that
   // extension.
   void OnActiveTabPermissionGranted(const Extension* extension);
 
   // Notifies the ActiveScriptController of detected ad injection.
-  void OnAdInjectionDetected(const std::set<std::string>& ad_injectors);
+  void OnAdInjectionDetected(const std::set<std::string> ad_injectors);
 
   // LocationBarControllerProvider implementation.
   virtual ExtensionAction* GetActionForExtension(
       const Extension* extension) OVERRIDE;
   virtual LocationBarController::Action OnClicked(
       const Extension* extension) OVERRIDE;
   virtual void OnNavigated() OVERRIDE;
 
  private:
   // A single pending request. This could be a pair, but we'd have way too many
   // stl typedefs, and "request.closure" is nicer than "request.first".
   struct PendingRequest {
     PendingRequest();  // For STL.
     PendingRequest(const base::Closure& closure, int page_id);
     ~PendingRequest();
 
     base::Closure closure;
     int page_id;
   };
   typedef std::vector<PendingRequest> PendingRequestList;
   typedef std::map<std::string, PendingRequestList> PendingRequestMap;
 
   // Runs any pending injections for the corresponding extension.
   void RunPendingForExtension(const Extension* extension);
 
-  // Handle the RequestContentScriptPermission message.
-  void OnRequestContentScriptPermission(const std::string& extension_id,
-                                        int page_id,
-                                        int request_id);
-
-  // Grants permission for the given request to run.
-  void GrantContentScriptPermission(int request_id);
+  // Handles the NotifyExtensionScriptExecution message.
+  void OnNotifyExtensionScriptExecution(const std::string& extension_id,
+                                        int page_id);
 
   // content::WebContentsObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // Log metrics.
   void LogUMA() const;
 
   // Whether or not the ActiveScriptController is enabled (corresponding to the
   // kActiveScriptEnforcement switch). If it is not, it acts as an empty shell,
   // always allowing scripts to run and never displaying actions.
@@ skipping 13 matching lines @@
   // that get generated for extensions that haven't declared anything.
   typedef std::map<std::string, linked_ptr<ExtensionAction> > ActiveScriptMap;
   ActiveScriptMap active_script_actions_;
 
   DISALLOW_COPY_AND_ASSIGN(ActiveScriptController);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_ACTIVE_SCRIPT_CONTROLLER_H_