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

chrome/browser/debugger/extension_ports_remote_service.h

 // 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.
 
 // ExtensionsPorts service: wires extension message ports through the
 // devtools remote protocol, allowing an external client program to
 // exchange messages with Chrome extensions.
 
 #ifndef CHROME_BROWSER_DEBUGGER_EXTENSION_PORTS_REMOTE_SERVICE_H_
 #define CHROME_BROWSER_DEBUGGER_EXTENSION_PORTS_REMOTE_SERVICE_H_
@@ skipping 59 matching lines @@
   } Result;
 
   virtual ~ExtensionPortsRemoteService();
 
   // Sends a JSON message with the |response| to the external client.
   // |tool| and |destination| are used as the respective header values.
   void SendResponse(const base::Value& response,
                     const std::string& tool,
                     const std::string& destination);
 
-  // Handles a message from the ExtensionMessageService.
+  // Handles requests from ExtensionMessageService to invoke specific
+  // JavaScript functions. Currently we only handle the "disconnect" function.
   void OnExtensionMessageInvoke(const std::string& extension_id,
                                 const std::string& function_name,
                                 const base::ListValue& args,
                                 const GURL& event_url);
   // Handles a message sent from an extension through the
   // ExtensionMessageService, to be passed to the external client.
-  void OnExtensionMessage(const std::string& message, int port_id);
+  void OnDeliverMessage(int port_id, const std::string& message);
   // Handles a disconnect event sent from the ExtensionMessageService.
   void OnExtensionPortDisconnected(int port_id);
 
   // Implementation for the commands we can receive from the external client.
   // Opens a channel to an extension.
   void ConnectCommand(base::DictionaryValue* content,
                       base::DictionaryValue* response);
   // Disconnects a message port.
   void DisconnectCommand(int port_id, base::DictionaryValue* response);
   // Sends a message to an extension through an established message port.
   void PostMessageCommand(int port_id,
                           base::DictionaryValue* content,
                           base::DictionaryValue* response);
 
   // The delegate is used to send responses and events back to the
   // external client, and to resolve tab IDs.
   DevToolsProtocolHandler* delegate_;
 
   // Set of message port IDs we successfully opened.
   typedef std::set<int> PortIdSet;
   PortIdSet openPortIds_;
 
   scoped_refptr<ExtensionMessageService> service_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionPortsRemoteService);
 };
 
 #endif  // CHROME_BROWSER_DEBUGGER_EXTENSION_PORTS_REMOTE_SERVICE_H_