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

chrome/browser/debugger/extension_ports_remote_service.cc

 // Copyright (c) 2011 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.
 
 // Implementation of the ExtensionPortsRemoteService.
 
 // Inspired significantly from debugger_remote_service
 // and ../automation/extension_port_container.
 
 #include "chrome/browser/debugger/extension_ports_remote_service.h"
@@ skipping 208 matching lines @@
       DevToolsRemoteMessageBuilder::instance().Create(
           tool, destination, response_content));
   delegate_->Send(*response_message.get());
 }
 
 bool ExtensionPortsRemoteService::Send(IPC::Message *message) {
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 
   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()
 
   delete message;
   return true;
 }
 
 void ExtensionPortsRemoteService::OnExtensionMessageInvoke(
     const std::string& extension_id,
     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))
       OnExtensionPortDisconnected(port_id);
   } else if (function_name == ExtensionMessageService::kDispatchOnConnect) {
     // There is no way for this service to be addressed and receive
     // connections.
     NOTREACHED() << function_name << " shouldn't be called.";
   } else {
     NOTREACHED() << function_name << " shouldn't be called.";
   }
 }
 
-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;
   content.SetString(kCommandKey, kOnMessage);
   content.SetInteger(kResultKey, RESULT_OK);
   // Turn the stringified message body back into JSON.
   Value* data = base::JSONReader::Read(message, false);
   if (!data) {
     NOTREACHED();
     return;
@@ skipping 103 matching lines @@
     VLOG(1) << "unknown port: " << port_id;
     response->SetInteger(kResultKey, RESULT_UNKNOWN_PORT);
     return;
   }
   // Post the message through the ExtensionMessageService.
   DCHECK(service_);
   service_->PostMessageFromRenderer(port_id, message);
   // Confirm to the external client that we sent its message.
   response->SetInteger(kResultKey, RESULT_OK);
 }