Use token-based initialisation for the utility process MojoApplication.

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 248 matching lines @@
 
 ChildThreadImpl::Options::Builder::Builder() {
 }
 
 ChildThreadImpl::Options::Builder&
 ChildThreadImpl::Options::Builder::InBrowserProcess(
     const InProcessChildThreadParams& params) {
   options_.browser_process_io_runner = params.io_runner();
   options_.channel_name = params.channel_name();
   options_.in_process_message_pipe_handle = params.handle();
+  options_.in_process_application_message_pipe_handle =
+      params.application_handle();
   return *this;
 }
 
 ChildThreadImpl::Options::Builder&
 ChildThreadImpl::Options::Builder::UseMojoChannel(bool use_mojo_channel) {
   options_.use_mojo_channel = use_mojo_channel;
   return *this;
 }
 
 ChildThreadImpl::Options::Builder&
@@ skipping 104 matching lines @@
     InitializeMojoIPCChannel();
   }
 
   if (MojoShellConnectionImpl::Get()) {
     base::ElapsedTimer timer;
     MojoShellConnectionImpl::Get()->BindToRequestFromCommandLine();
     UMA_HISTOGRAM_TIMES("Mojo.Shell.ChildConnectionTime", timer.Elapsed());
   }
 
   mojo_application_.reset(new MojoApplication(GetIOTaskRunner()));
+  if (!IsInBrowserProcess()) {
+    std::string mojo_application_token =
+        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+            switches::kMojoApplicationChannelToken);
+    if (!mojo_application_token.empty())
+      mojo_application_->InitWithToken(mojo_application_token);
+  } else {
+    mojo::ScopedMessagePipeHandle handle(
+        options.in_process_application_message_pipe_handle);
+    if (handle.is_valid())
+      mojo_application_->InitWithPipe(std::move(handle));
+  }
 
   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 306 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