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

chrome/browser/debugger/extension_ports_remote_service.h

Index: chrome/browser/debugger/extension_ports_remote_service.h
===================================================================
--- chrome/browser/debugger/extension_ports_remote_service.h	(revision 103262)
+++ chrome/browser/debugger/extension_ports_remote_service.h	(working copy)
@@ -77,14 +77,15 @@
                     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);