Revert 103263 - Merge 101221 - Reland 101111 - Only deliver extension messages to contexts that c...

chrome/browser/debugger/extension_ports_remote_service.cc

Index: chrome/browser/debugger/extension_ports_remote_service.cc
===================================================================
--- chrome/browser/debugger/extension_ports_remote_service.cc	(revision 103508)
+++ chrome/browser/debugger/extension_ports_remote_service.cc	(working copy)
@@ -226,7 +226,6 @@
 
   IPC_BEGIN_MESSAGE_MAP(ExtensionPortsRemoteService, *message)
     IPC_MESSAGE_HANDLER(ExtensionMsg_MessageInvoke, OnExtensionMessageInvoke)
-    IPC_MESSAGE_HANDLER(ExtensionMsg_DeliverMessage, OnDeliverMessage)
     IPC_MESSAGE_UNHANDLED_ERROR()
   IPC_END_MESSAGE_MAP()
 
@@ -239,7 +238,13 @@
     const std::string& function_name,
     const ListValue& args,
     const GURL& event_url) {
-  if (function_name == ExtensionMessageService::kDispatchOnDisconnect) {
+  if (function_name == ExtensionMessageService::kDispatchOnMessage) {
+    DCHECK_EQ(args.GetSize(), 2u);
+    std::string message;
+    int port_id;
+    if (args.GetString(0, &message) && args.GetInteger(1, &port_id))
+      OnExtensionMessage(message, port_id);
+  } else if (function_name == ExtensionMessageService::kDispatchOnDisconnect) {
     DCHECK_EQ(args.GetSize(), 1u);
     int port_id;
     if (args.GetInteger(0, &port_id))
@@ -253,8 +258,8 @@
   }
 }
 
-void ExtensionPortsRemoteService::OnDeliverMessage(
-    int port_id, const std::string& message) {
+void ExtensionPortsRemoteService::OnExtensionMessage(
+    const std::string& message, int port_id) {
   VLOG(1) << "Message event: from port " << port_id << ", < " << message << ">";
   // Transpose the information into a JSON message for the external client.
   DictionaryValue content;