Revert 101111 - Only deliver extension messages to contexts that care. This

save 60 (of 70) mb of string data on www.mashable.com with
AdBlock installed.

BUG=96544,76571

Review URL: http://codereview.chromium.org/7890024

TBR=aa@chromium.org
Review URL: http://codereview.chromium.org/7888050

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101130 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
index 1fe3455..57df12a 100644
--- a/chrome/browser/extensions/extension_message_service.cc
+++ b/chrome/browser/extensions/extension_message_service.cc
@@ -50,6 +50,8 @@ const char ExtensionMessageService::kDispatchOnConnect[] =
     "Port.dispatchOnConnect";
 const char ExtensionMessageService::kDispatchOnDisconnect[] =
     "Port.dispatchOnDisconnect";
+const char ExtensionMessageService::kDispatchOnMessage[] =
+    "Port.dispatchOnMessage";
 
 namespace {
 
@@ -86,10 +88,12 @@ static void DispatchOnDisconnect(
 }
 
 static void DispatchOnMessage(const ExtensionMessageService::MessagePort& port,
-                              const std::string& message, int target_port_id) {
-  port.sender->Send(
-      new ExtensionMsg_DeliverMessage(
-          port.routing_id, target_port_id, message));
+                              const std::string& message, int source_port_id) {
+  ListValue args;
+  args.Set(0, Value::CreateStringValue(message));
+  args.Set(1, Value::CreateIntegerValue(source_port_id));
+  port.sender->Send(new ExtensionMsg_MessageInvoke(port.routing_id,
+      "", ExtensionMessageService::kDispatchOnMessage, args, GURL()));
 }
 
 }  // namespace