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

chrome/browser/extensions/extension_message_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.
 
 #include "chrome/browser/extensions/extension_message_service.h"
 
 #include "base/atomic_sequence_num.h"
 #include "base/json/json_writer.h"
 #include "base/stl_util.h"
 #include "base/values.h"
@@ skipping 32 matching lines @@
 
 struct ExtensionMessageService::MessageChannel {
   ExtensionMessageService::MessagePort opener;
   ExtensionMessageService::MessagePort receiver;
 };
 
 const char ExtensionMessageService::kDispatchOnConnect[] =
     "Port.dispatchOnConnect";
 const char ExtensionMessageService::kDispatchOnDisconnect[] =
     "Port.dispatchOnDisconnect";
-const char ExtensionMessageService::kDispatchOnMessage[] =
-    "Port.dispatchOnMessage";
 
 namespace {
 
 static base::AtomicSequenceNumber g_next_channel_id(base::LINKER_INITIALIZED);
 
 static void DispatchOnConnect(const ExtensionMessageService::MessagePort& port,
                               int dest_port_id,
                               const std::string& channel_name,
                               const std::string& tab_json,
                               const std::string& source_extension_id,
@@ skipping 16 matching lines @@
     const ExtensionMessageService::MessagePort& port, int source_port_id,
     bool connection_error) {
   ListValue args;
   args.Set(0, Value::CreateIntegerValue(source_port_id));
   args.Set(1, Value::CreateBooleanValue(connection_error));
   port.sender->Send(new ExtensionMsg_MessageInvoke(port.routing_id,
       "", ExtensionMessageService::kDispatchOnDisconnect, args, GURL()));
 }
 
 static void DispatchOnMessage(const ExtensionMessageService::MessagePort& port,
-                              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()));
+                              const std::string& message, int target_port_id) {
+  port.sender->Send(
+      new ExtensionMsg_DeliverMessage(
+          port.routing_id, target_port_id, message));
 }
 
 }  // namespace
 
 // static
 void ExtensionMessageService::AllocatePortIdPair(int* port1, int* port2) {
   int channel_id = g_next_channel_id.GetNext();
   int port1_id = channel_id * 2;
   int port2_id = channel_id * 2 + 1;
 
@@ skipping 254 matching lines @@
 
     if (current->second->opener.sender == sender) {
       CloseChannelImpl(current, GET_CHANNEL_OPENER_ID(current->first),
                        notify_other_port);
     } else if (current->second->receiver.sender == sender) {
       CloseChannelImpl(current, GET_CHANNEL_RECEIVERS_ID(current->first),
                        notify_other_port);
     }
   }
 }