Allow ChildThreadImpl subclasses to manually start MojoShellConnection

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 247 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::kMojoChannelToken)) {
+          switches::kMojoChannelToken)),
+      auto_start_mojo_shell_connection(true) {
 }
 
 ChildThreadImpl::Options::Options(const Options& other) = default;
 
 ChildThreadImpl::Options::~Options() {
 }
 
 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_ipc_token = params.ipc_token();
   options_.in_process_application_token = params.application_token();
   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&
+ChildThreadImpl::Options::Builder::AutoStartMojoShellConnection(
+    bool auto_start) {
+  options_.auto_start_mojo_shell_connection = auto_start;
+  return *this;
+}
+
+ChildThreadImpl::Options::Builder&
 ChildThreadImpl::Options::Builder::WithChannelName(
     const std::string& channel_name) {
   options_.channel_name = channel_name;
   return *this;
 }
 
 ChildThreadImpl::Options::Builder&
 ChildThreadImpl::Options::Builder::AddStartupFilter(
     IPC::MessageFilter* filter) {
   options_.startup_filters.push_back(filter);
@@ skipping 116 matching lines @@
         mojo::MakeRequest<shell::mojom::Service>(std::move(handle)),
         GetIOTaskRunner());
 
     // TODO(rockot): Remove this once all child-to-browser interface connections
     // are made via a Connector rather than directly through an
     // InterfaceProvider, and all exposed interfaces are exposed via a
     // ConnectionFilter.
     mojo_shell_connection_->SetupInterfaceRequestProxies(
         GetInterfaceRegistry(), GetRemoteInterfaces());
 
-    AddConnectionFilters(mojo_shell_connection_.get());
-    mojo_shell_connection_->Start();
+    if (options.auto_start_mojo_shell_connection)
+      StartMojoShellConnection();
   }
 
   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 245 matching lines @@
 
   if (handled)
     return true;
 
   if (msg.routing_id() == MSG_ROUTING_CONTROL)
     return OnControlMessageReceived(msg);
 
   return router_.OnMessageReceived(msg);
 }
 
-void ChildThreadImpl::AddConnectionFilters(MojoShellConnection* connection) {}
+void ChildThreadImpl::StartMojoShellConnection() {
+  DCHECK(mojo_shell_connection_);
+  mojo_shell_connection_->Start();
+}
 
 bool ChildThreadImpl::OnControlMessageReceived(const IPC::Message& msg) {
   return false;
 }
 
 void ChildThreadImpl::OnProcessBackgrounded(bool backgrounded) {
   // Set timer slack to maximum on main thread when in background.
   base::TimerSlack timer_slack = base::TIMER_SLACK_NONE;
   if (backgrounded)
     timer_slack = base::TIMER_SLACK_MAXIMUM;
@@ skipping 63 matching lines @@
 void ChildThreadImpl::EnsureConnected() {
   VLOG(0) << "ChildThreadImpl::EnsureConnected()";
   base::Process::Current().Terminate(0, false);
 }
 
 bool ChildThreadImpl::IsInBrowserProcess() const {
   return static_cast<bool>(browser_process_io_runner_);
 }
 
 }  // namespace content