Make MessagingBindings use ScriptContextSet::ForEach

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 249 matching lines @@
       render_view(), extension_id, module_name, function_name, args,
       user_gesture);
 }
 
 void ExtensionHelper::OnExtensionDispatchOnConnect(
     int target_port_id,
     const std::string& channel_name,
     const base::DictionaryValue& source_tab,
     const ExtensionMsg_ExternalConnectionInfo& info,
     const std::string& tls_channel_id) {
-  MessagingBindings::DispatchOnConnect(
-      dispatcher_->script_context_set().GetAll(),
-      target_port_id,
-      channel_name,
-      source_tab,
-      info.source_id,
-      info.target_id,
-      info.source_url,
-      tls_channel_id,
-      render_view());
+  MessagingBindings::DispatchOnConnect(dispatcher_->script_context_set(),
+                                       target_port_id,
+                                       channel_name,
+                                       source_tab,
+                                       info,
+                                       tls_channel_id,
+                                       render_view());
 }
 
 void ExtensionHelper::OnExtensionDeliverMessage(int target_id,
                                                 const Message& message) {
-  MessagingBindings::DeliverMessage(dispatcher_->script_context_set().GetAll(),
-                                    target_id,
-                                    message,
-                                    render_view());
+  MessagingBindings::DeliverMessage(
+      dispatcher_->script_context_set(), target_id, message, render_view());
 }
 
 void ExtensionHelper::OnExtensionDispatchOnDisconnect(
     int port_id,
     const std::string& error_message) {
   MessagingBindings::DispatchOnDisconnect(
-      dispatcher_->script_context_set().GetAll(),
-      port_id,
-      error_message,
-      render_view());
+      dispatcher_->script_context_set(), port_id, error_message, render_view());
 }
 
 void ExtensionHelper::OnExecuteCode(
     const ExtensionMsg_ExecuteCode_Params& params) {
   WebView* webview = render_view()->GetWebView();
   WebFrame* main_frame = webview->mainFrame();
   if (!main_frame) {
     base::ListValue val;
     Send(new ExtensionHostMsg_ExecuteCodeFinished(routing_id(),
                                                   params.request_id,
@@ skipping 41 matching lines @@
   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