Enable messaging over a navigator.connect initiated channel.

content/browser/message_port_message_filter.cc

 // Copyright 2013 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 "content/browser/message_port_message_filter.h"
 
 #include "content/browser/message_port_service.h"
 #include "content/common/message_port_messages.h"
 
 namespace content {
 
 MessagePortMessageFilter::MessagePortMessageFilter(
     const NextRoutingIDCallback& callback)
     : BrowserMessageFilter(MessagePortMsgStart),
       next_routing_id_(callback) {
 }
 
 MessagePortMessageFilter::~MessagePortMessageFilter() {
 }
 
 void MessagePortMessageFilter::OnChannelClosing() {
-  MessagePortService::GetInstance()->OnMessagePortMessageFilterClosing(this);
+  MessagePortService::GetInstance()->OnMessagePortDelegateClosing(this);
 }
 
 bool MessagePortMessageFilter::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(MessagePortMessageFilter, message)
     IPC_MESSAGE_HANDLER(MessagePortHostMsg_CreateMessagePort,
                         OnCreateMessagePort)
     IPC_MESSAGE_FORWARD(MessagePortHostMsg_DestroyMessagePort,
                         MessagePortService::GetInstance(),
                         MessagePortService::Destroy)
@@ skipping 19 matching lines @@
 }
 
 void MessagePortMessageFilter::OnDestruct() const {
   BrowserThread::DeleteOnIOThread::Destruct(this);
 }
 
 int MessagePortMessageFilter::GetNextRoutingID() {
   return next_routing_id_.Run();
 }
 
+void MessagePortMessageFilter::SendMessage(
+    int route_id,
+    const base::string16& message,
+    const std::vector<int>& sent_message_port_ids) {
+  // If a message port was sent around, the new location will need a routing

[scheib, 2014/12/18 00:24:10]

This code block is more indirect now that a nesting of two helpers are doing the
work. The comment helps, but may be clearer as:

When |sent_message_port_ids| is non-empty generate and send |new_routing_ids| to
avoid waiting for the created ports to send a sync message with routing ids.

[Marijn Kruisselbrink, 2014/12/19 00:09:21]

Okay, slightly rephrased the comment.

+  // id.  Instead of having the created port send us a sync message to get it,
+  // send along with the message.
+  std::vector<int> new_routing_ids;
+  UpdateMessagePortsWithNewRoutes(sent_message_port_ids, &new_routing_ids);
+  Send(new MessagePortMsg_Message(route_id, message, sent_message_port_ids,
+                                  new_routing_ids));
+}
+
+void MessagePortMessageFilter::SendMessagesAreQueued(int route_id) {
+  Send(new MessagePortMsg_MessagesQueued(route_id));
+}
+
 void MessagePortMessageFilter::UpdateMessagePortsWithNewRoutes(
     const std::vector<int>& message_port_ids,
     std::vector<int>* new_routing_ids) {
   DCHECK(new_routing_ids);
   new_routing_ids->clear();
   new_routing_ids->resize(message_port_ids.size());
 
   for (size_t i = 0; i < message_port_ids.size(); ++i) {
     (*new_routing_ids)[i] = GetNextRoutingID();
     MessagePortService::GetInstance()->UpdateMessagePort(
         message_port_ids[i],
         this,
         (*new_routing_ids)[i]);
   }
 }
 
 void MessagePortMessageFilter::OnCreateMessagePort(int *route_id,
                                                    int* message_port_id) {
   *route_id = next_routing_id_.Run();
   MessagePortService::GetInstance()->Create(*route_id, this, message_port_id);
 }
 
 }  // namespace content