Update client side navigator.connect API to use ServicePortCollection [2/3]

content/child/webmessageportchannel_impl.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 "content/child/webmessageportchannel_impl.h"
 
 #include "base/bind.h"
 #include "base/values.h"
 #include "content/child/child_process.h"
 #include "content/child/child_thread_impl.h"
@@ skipping 101 matching lines @@
     message_ports[i].id = webchannel->message_port_id();
     message_ports[i].send_messages_as_values =
         webchannel->send_messages_as_values_;
     webchannel->QueueMessages();
     DCHECK(message_ports[i].id != MSG_ROUTING_NONE);
   }
   return message_ports;
 }
 
 // static
+std::vector<TransferredMessagePort>
+WebMessagePortChannelImpl::ExtractMessagePortIDsWithoutQueueing(
+    scoped_ptr<WebMessagePortChannelArray> channels) {
+  if (!channels)
+    return std::vector<TransferredMessagePort>();
+
+  std::vector<TransferredMessagePort> message_ports(channels->size());
+  for (size_t i = 0; i < channels->size(); ++i) {
+    WebMessagePortChannelImpl* webchannel =
+        static_cast<WebMessagePortChannelImpl*>((*channels)[i]);
+    // The message port ids might not be set up yet if this channel
+    // wasn't created on the main thread.
+    DCHECK(webchannel->main_thread_task_runner_->BelongsToCurrentThread());
+    message_ports[i].id = webchannel->message_port_id();
+    message_ports[i].send_messages_as_values =
+        webchannel->send_messages_as_values_;
+    // Don't queue messages, but do increase the child processes ref-count to
+    // ensure this child process stays alive long enough to receive all
+    // in-flight messages.
+    ChildProcess::current()->AddRefProcess();
+    DCHECK(message_ports[i].id != MSG_ROUTING_NONE);
+  }
+  return message_ports;
+}
+
+// static
 WebMessagePortChannelArray WebMessagePortChannelImpl::CreatePorts(
     const std::vector<TransferredMessagePort>& message_ports,
     const std::vector<int>& new_routing_ids,
     const scoped_refptr<base::SingleThreadTaskRunner>&
         main_thread_task_runner) {
   DCHECK_EQ(message_ports.size(), new_routing_ids.size());
   WebMessagePortChannelArray channels(message_ports.size());
   for (size_t i = 0; i < message_ports.size() && i < new_routing_ids.size();
        ++i) {
     channels[i] = new WebMessagePortChannelImpl(
@@ skipping 191 matching lines @@
 
   Release();
   ChildProcess::current()->ReleaseProcess();
 }
 
 WebMessagePortChannelImpl::Message::Message() {}
 
 WebMessagePortChannelImpl::Message::~Message() {}
 
 }  // namespace content