Revert 258831 "Revert 258727 "Implement ServiceWorker::postMessage()""

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/message_loop/message_loop_proxy.h"
 #include "content/child/child_process.h"
 #include "content/child/child_thread.h"
@@ skipping 41 matching lines @@
     message_queue_.pop();
   }
 
   if (message_port_id_ != MSG_ROUTING_NONE)
     Send(new MessagePortHostMsg_DestroyMessagePort(message_port_id_));
 
   if (route_id_ != MSG_ROUTING_NONE)
     ChildThread::current()->GetRouter()->RemoveRoute(route_id_);
 }
 
+// static
+std::vector<int> WebMessagePortChannelImpl::ExtractMessagePortIDs(
+    WebMessagePortChannelArray* channels) {
+  std::vector<int> message_port_ids;
+  if (channels) {
+    message_port_ids.resize(channels->size());
+    // Extract the port IDs from the source array, then free it.
+    for (size_t i = 0; i < channels->size(); ++i) {
+      WebMessagePortChannelImpl* webchannel =
+          static_cast<WebMessagePortChannelImpl*>((*channels)[i]);
+      message_port_ids[i] = webchannel->message_port_id();
+      webchannel->QueueMessages();
+      DCHECK(message_port_ids[i] != MSG_ROUTING_NONE);
+    }
+    delete channels;
+  }
+  return message_port_ids;
+}
+
 void WebMessagePortChannelImpl::setClient(WebMessagePortChannelClient* client) {
   // Must lock here since client_ is called on the main thread.
   base::AutoLock auto_lock(lock_);
   client_ = client;
 }
 
 void WebMessagePortChannelImpl::destroy() {
   setClient(NULL);
 
   // Release the object on the main thread, since the destructor might want to
@@ skipping 19 matching lines @@
         base::Bind(
             &WebMessagePortChannelImpl::PostMessage, this, message, channels));
   } else {
     PostMessage(message, channels);
   }
 }
 
 void WebMessagePortChannelImpl::PostMessage(
     const base::string16& message,
     WebMessagePortChannelArray* channels) {
-  std::vector<int> message_port_ids(channels ? channels->size() : 0);
-  if (channels) {
-    // Extract the port IDs from the source array, then free it.
-    for (size_t i = 0; i < channels->size(); ++i) {
-      WebMessagePortChannelImpl* webchannel =
-          static_cast<WebMessagePortChannelImpl*>((*channels)[i]);
-      message_port_ids[i] = webchannel->message_port_id();
-      webchannel->QueueMessages();
-      DCHECK(message_port_ids[i] != MSG_ROUTING_NONE);
-    }
-    delete channels;
-  }
-
   IPC::Message* msg = new MessagePortHostMsg_PostMessage(
-      message_port_id_, message, message_port_ids);
+      message_port_id_, message, ExtractMessagePortIDs(channels));
   Send(msg);
 }
 
 bool WebMessagePortChannelImpl::tryGetMessage(
     WebString* message,
     WebMessagePortChannelArray& channels) {
   base::AutoLock auto_lock(lock_);
   if (message_queue_.empty())
     return false;
 
@@ skipping 129 matching lines @@
 
   Release();
   ChildProcess::current()->ReleaseProcess();
 }
 
 WebMessagePortChannelImpl::Message::Message() {}
 
 WebMessagePortChannelImpl::Message::~Message() {}
 
 }  // namespace content