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

trunk/src/extensions/renderer/extension_helper.cc

 // 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.
 
 #include "extensions/renderer/extension_helper.h"
 
 #include "base/lazy_instance.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "extensions/common/api/messaging/message.h"
@@ skipping 140 matching lines @@
                         OnExtensionDispatchOnDisconnect)
     IPC_MESSAGE_HANDLER(ExtensionMsg_ExecuteCode, OnExecuteCode)
     IPC_MESSAGE_HANDLER(ExtensionMsg_SetTabId, OnSetTabId)
     IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateBrowserWindowId,
                         OnUpdateBrowserWindowId)
     IPC_MESSAGE_HANDLER(ExtensionMsg_NotifyRenderViewType,
                         OnNotifyRendererViewType)
     IPC_MESSAGE_HANDLER(ExtensionMsg_AddMessageToConsole,
                         OnAddMessageToConsole)
     IPC_MESSAGE_HANDLER(ExtensionMsg_AppWindowClosed,
-                        OnAppWindowClosed)
-    IPC_MESSAGE_HANDLER(ExtensionMsg_GrantContentScriptPermission,
-                        OnGrantContentScriptPermission)
+                        OnAppWindowClosed);
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ExtensionHelper::DidFinishDocumentLoad(WebLocalFrame* frame) {
   dispatcher_->user_script_slave()->InjectScripts(
       frame, UserScript::DOCUMENT_END);
 
   SchedulerMap::iterator i = g_schedulers.Get().find(frame);
@@ skipping 38 matching lines @@
 
 void ExtensionHelper::FrameDetached(WebFrame* frame) {
   // This could be called before DidCreateDataSource, in which case the frame
   // won't be in the map.
   SchedulerMap::iterator i = g_schedulers.Get().find(frame);
   if (i == g_schedulers.Get().end())
     return;
 
   delete i->second;
   g_schedulers.Get().erase(i);
-
-  dispatcher_->user_script_slave()->FrameDetached(frame);
 }
 
 void ExtensionHelper::DidMatchCSS(
     blink::WebLocalFrame* frame,
     const blink::WebVector<blink::WebString>& newly_matching_selectors,
     const blink::WebVector<blink::WebString>& stopped_matching_selectors) {
   dispatcher_->DidMatchCSS(
       frame, newly_matching_selectors, stopped_matching_selectors);
 }
 
@@ skipping 109 matching lines @@
   v8::Handle<v8::Context> v8_context =
       render_view()->GetWebView()->mainFrame()->mainWorldScriptContext();
   ScriptContext* script_context =
       dispatcher_->script_context_set().GetByV8Context(v8_context);
   if (!script_context)
     return;
   script_context->module_system()->CallModuleMethod("app.window",
                                                     "onAppWindowClosed");
 }
 
-void ExtensionHelper::OnGrantContentScriptPermission(int request_id) {
-  dispatcher_->user_script_slave()->OnContentScriptGrantedPermission(
-      render_view(), request_id);
-}
-
 }  // namespace extensions