Merge 101221 - Reland 101111 - Only deliver extension messages to contexts that care.

chrome/browser/extensions/extension_messages_browsertest.cc

Index: chrome/browser/extensions/extension_messages_browsertest.cc
===================================================================
--- chrome/browser/extensions/extension_messages_browsertest.cc	(revision 103262)
+++ chrome/browser/extensions/extension_messages_browsertest.cc	(working copy)
@@ -8,6 +8,7 @@
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/extensions/event_bindings.h"
+#include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/test/base/render_view_test.h"
 #include "content/common/view_messages.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -34,14 +35,6 @@
       "", ExtensionMessageService::kDispatchOnDisconnect, args, NULL, GURL());
 }
 
-static void DispatchOnMessage(const std::string& message, int source_port_id) {
-  ListValue args;
-  args.Set(0, Value::CreateStringValue(message));
-  args.Set(1, Value::CreateIntegerValue(source_port_id));
-  EventBindings::CallFunction(
-      "", ExtensionMessageService::kDispatchOnMessage, args, NULL, GURL());
-}
-
 // Tests that the bindings for opening a channel to an extension and sending
 // and receiving messages through that channel all works.
 TEST_F(RenderViewTest, ExtensionMessagesOpenChannel) {
@@ -76,7 +69,7 @@
   // Now simulate getting a message back from the other side.
   render_thread_.sink().ClearMessages();
   const int kPortId = 0;
-  DispatchOnMessage("{\"val\": 42}", kPortId);
+  RendererExtensionBindings::DeliverMessage(kPortId, "{\"val\": 42}", NULL);
 
   // Verify that we got it.
   const IPC::Message* alert_msg =
@@ -128,7 +121,7 @@
 
   // Now simulate getting a message back from the channel opener.
   render_thread_.sink().ClearMessages();
-  DispatchOnMessage("{\"val\": 42}", kPortId);
+  RendererExtensionBindings::DeliverMessage(kPortId, "{\"val\": 42}", NULL);
 
   // Verify that we got it.
   const IPC::Message* alert_msg =