Re-enable ChannelMojo between Service process <-> service utility process.

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 278 matching lines @@
 }  // namespace
 
 ChildThread* ChildThread::Get() {
   return ChildThreadImpl::current();
 }
 
 ChildThreadImpl::Options::Options()
     : channel_name(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kProcessChannelID)),
       use_mojo_channel(base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kMojoApplicationChannelToken)),
+                           switches::kMojoApplicationChannelToken) ||
+                       base::CommandLine::ForCurrentProcess()->HasSwitch(
+                           switches::kMojoChannelToken)),
       auto_start_mojo_shell_connection(true),
-      connect_to_browser(false) {
-}
+      connect_to_browser(false) {}
 
 ChildThreadImpl::Options::Options(const Options& other) = default;
 
 ChildThreadImpl::Options::~Options() {
 }
 
 ChildThreadImpl::Options::Builder::Builder() {
 }
 
 ChildThreadImpl::Options::Builder&
@@ skipping 582 matching lines @@
       associated_interface_provider_bindings_.dispatch_context()));
   router_.GetRoute(routing_id)->OnAssociatedInterfaceRequest(
       name, request.PassHandle());
 }
 
 bool ChildThreadImpl::IsInBrowserProcess() const {
   return static_cast<bool>(browser_process_io_runner_);
 }
 
 }  // namespace content