Resubmit: Block content scripts from executing until user grants permission

chrome/browser/extensions/active_script_controller.h

Index: chrome/browser/extensions/active_script_controller.h
diff --git a/chrome/browser/extensions/active_script_controller.h b/chrome/browser/extensions/active_script_controller.h
index f7b20888b0338840c819e3b0d76dddfa721894c4..457e5800e1ec1e50f1e6e3f8cb1626bdebc4cc53 100644
--- a/chrome/browser/extensions/active_script_controller.h
+++ b/chrome/browser/extensions/active_script_controller.h
@@ -62,7 +62,7 @@ class ActiveScriptController : public LocationBarController::ActionProvider,
   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,9 +88,13 @@ class ActiveScriptController : public LocationBarController::ActionProvider,
   // Runs any pending injections for the corresponding extension.
   void RunPendingForExtension(const Extension* extension);
 
-  // Handles the NotifyExtensionScriptExecution message.
-  void OnNotifyExtensionScriptExecution(const std::string& extension_id,
-                                        int page_id);
+  // 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);
 
   // content::WebContentsObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;