Add a thread-safe CreateChannel method to ChannelManager.

mojo/edk/system/channel_manager.cc

 // Copyright 2014 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 "mojo/edk/system/channel_manager.h"
 
 #include "base/bind.h"
+#include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
+#include "base/task_runner.h"
 
 namespace mojo {
 namespace system {
 
 namespace {
 
 void ShutdownChannelHelper(const ChannelInfo& channel_info) {
   if (base::MessageLoopProxy::current() ==
       channel_info.channel_thread_task_runner) {
     channel_info.channel->Shutdown();
@@ skipping 32 matching lines @@
 
   {
     base::AutoLock locker(lock_);
     CHECK(channel_infos_.find(channel_id) == channel_infos_.end());
     channel_infos_[channel_id] =
         ChannelInfo(channel, base::MessageLoopProxy::current());
   }
   channel->SetChannelManager(this);
 }
 
+void ChannelManager::CreateChannel(
+    ChannelId channel_id,
+    embedder::ScopedPlatformHandle platform_handle,
+    scoped_refptr<system::ChannelEndpoint> bootstrap_channel_endpoint,
+    scoped_refptr<base::TaskRunner> io_thread_task_runner,
+    base::Closure callback,
+    scoped_refptr<base::TaskRunner> callback_thread_task_runner) {
+  DCHECK(io_thread_task_runner);
+  DCHECK(!callback.is_null());
+  // (|callback_thread_task_runner| may be null.)
+
+  io_thread_task_runner->PostTask(
+      FROM_HERE,
+      base::Bind(&ChannelManager::CreateChannelHelper, base::Unretained(this),
+                 channel_id, base::Passed(&platform_handle),
+                 bootstrap_channel_endpoint, callback,
+                 callback_thread_task_runner));
+}
+
 scoped_refptr<Channel> ChannelManager::GetChannel(ChannelId channel_id) const {
   base::AutoLock locker(lock_);
   auto it = channel_infos_.find(channel_id);
   DCHECK(it != channel_infos_.end());
   return it->second.channel;
 }
 
 void ChannelManager::WillShutdownChannel(ChannelId channel_id) {
   GetChannel(channel_id)->WillShutdownSoon();
 }
 
 void ChannelManager::ShutdownChannel(ChannelId channel_id) {
   ChannelInfo channel_info;
   {
     base::AutoLock locker(lock_);
     auto it = channel_infos_.find(channel_id);
     DCHECK(it != channel_infos_.end());
     channel_info.Swap(&it->second);
     channel_infos_.erase(it);
   }
   ShutdownChannelHelper(channel_info);
 }
 
+void ChannelManager::CreateChannelHelper(
+    ChannelId channel_id,
+    embedder::ScopedPlatformHandle platform_handle,
+    scoped_refptr<system::ChannelEndpoint> bootstrap_channel_endpoint,
+    base::Closure callback,
+    scoped_refptr<base::TaskRunner> callback_thread_task_runner) {
+  CreateChannelOnIOThread(channel_id, platform_handle.Pass(),
+                          bootstrap_channel_endpoint);
+  if (callback_thread_task_runner)
+    callback_thread_task_runner->PostTask(FROM_HERE, callback);
+  else
+    callback.Run();
+}
+
 }  // namespace system
 }  // namespace mojo