Resubmit: Block content scripts from executing until user grants permission

extensions/renderer/extension_helper.cc

Index: extensions/renderer/extension_helper.cc
diff --git a/extensions/renderer/extension_helper.cc b/extensions/renderer/extension_helper.cc
index 915097ba66d506273ac79160e013a090a8b91963..a3d4362f4483193f274de0fd37027287b2716ef9 100644
--- a/extensions/renderer/extension_helper.cc
+++ b/extensions/renderer/extension_helper.cc
@@ -158,7 +158,9 @@ bool ExtensionHelper::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ExtensionMsg_AddMessageToConsole,
                         OnAddMessageToConsole)
     IPC_MESSAGE_HANDLER(ExtensionMsg_AppWindowClosed,
-                        OnAppWindowClosed);
+                        OnAppWindowClosed)
+    IPC_MESSAGE_HANDLER(ExtensionMsg_GrantContentScriptPermission,
+                        OnGrantContentScriptPermission)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -217,6 +219,8 @@ void ExtensionHelper::FrameDetached(WebFrame* frame) {
 
   delete i->second;
   g_schedulers.Get().erase(i);
+
+  dispatcher_->user_script_slave()->FrameDetached(frame);
 }
 
 void ExtensionHelper::DidMatchCSS(
@@ -346,4 +350,9 @@ void ExtensionHelper::OnAppWindowClosed() {
                                                     "onAppWindowClosed");
 }
 
+void ExtensionHelper::OnGrantContentScriptPermission(int request_id) {
+  dispatcher_->user_script_slave()->OnContentScriptGrantedPermission(
+      render_view(), request_id);
+}
+
 }  // namespace extensions