[mojo] Ports EDK

content/child/child_thread_impl.cc

 // Copyright (c) 2012 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/child_thread_impl.h"
 
 #include <signal.h>
 #include <string>
 #include <utility>
 
@@ skipping 370 matching lines @@
 #endif
 
   channel_ =
       IPC::SyncChannel::Create(this, ChildProcess::current()->io_task_runner(),
                                ChildProcess::current()->GetShutDownEvent());
 #ifdef IPC_MESSAGE_LOG_ENABLED
   if (!IsInBrowserProcess())
     IPC::Logging::GetInstance()->SetIPCSender(this);
 #endif
 
-  mojo_ipc_support_.reset(new IPC::ScopedIPCSupport(GetIOTaskRunner()));
+  if (!IsInBrowserProcess()) {
+    // Don't double-initialize IPC support in single-process mode.
+    mojo_ipc_support_.reset(new IPC::ScopedIPCSupport(GetIOTaskRunner()));
+  }
+
   mojo_application_.reset(new MojoApplication(GetIOTaskRunner()));
 
   sync_message_filter_ = channel_->CreateSyncMessageFilter();
   thread_safe_sender_ = new ThreadSafeSender(
       message_loop_->task_runner(), sync_message_filter_.get());
 
   resource_dispatcher_.reset(new ResourceDispatcher(
       this, message_loop()->task_runner()));
   websocket_dispatcher_.reset(new WebSocketDispatcher);
   file_system_dispatcher_.reset(new FileSystemDispatcher());
@@ skipping 278 matching lines @@
 }
 
 void ChildThreadImpl::OnBindExternalMojoShellHandle(
     const IPC::PlatformFileForTransit& file) {
 #if defined(MOJO_SHELL_CLIENT)
 #if defined(OS_POSIX)
   base::PlatformFile handle = file.fd;
 #elif defined(OS_WIN)
   base::PlatformFile handle = file;
 #endif
-  mojo::ScopedMessagePipeHandle message_pipe =
-      mojo_shell_channel_init_.Init(handle, GetIOTaskRunner());
-  DCHECK(message_pipe.is_valid());
-  MojoShellConnectionImpl::Get()->BindToMessagePipe(std::move(message_pipe));
+  mojo_shell_channel_init_.Init(
+      handle, GetIOTaskRunner(),
+      base::Bind(&MojoShellConnectionImpl::BindToMessagePipe,
+                 base::Unretained(MojoShellConnectionImpl::Get())));
 #endif  // defined(MOJO_SHELL_CLIENT)
 }
 
 void ChildThreadImpl::OnSetMojoParentPipeHandle(
     const IPC::PlatformFileForTransit& file) {
   mojo::embedder::SetParentPipeHandle(
       mojo::embedder::ScopedPlatformHandle(mojo::embedder::PlatformHandle(
           IPC::PlatformFileForTransitToPlatformFile(file))));
 }
 
@@ skipping 27 matching lines @@
 void ChildThreadImpl::EnsureConnected() {
   VLOG(0) << "ChildThreadImpl::EnsureConnected()";
   base::Process::Current().Terminate(0, false);
 }
 
 bool ChildThreadImpl::IsInBrowserProcess() const {
   return browser_process_io_runner_;
 }
 
 }  // namespace content