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

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

Index: trunk/src/chrome/browser/extensions/active_script_controller.h
===================================================================
--- trunk/src/chrome/browser/extensions/active_script_controller.h	(revision 274101)
+++ trunk/src/chrome/browser/extensions/active_script_controller.h	(working copy)
@@ -62,7 +62,7 @@
   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(
@@ -88,14 +88,10 @@
   // 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);
+  // Handles the NotifyExtensionScriptExecution message.
+  void OnNotifyExtensionScriptExecution(const std::string& extension_id,
+                                        int page_id);
 
-  // Grants permission for the given request to run.
-  void GrantContentScriptPermission(int request_id);
-
   // content::WebContentsObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;