Allow ChildThreadImpl subclasses to manually start MojoShellConnection

content/child/child_thread_impl.h

 // 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.
 
 #ifndef CONTENT_CHILD_CHILD_THREAD_IMPL_H_
 #define CONTENT_CHILD_CHILD_THREAD_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 185 matching lines @@
   // process.
   static void ShutdownThread();
 #endif
 
  protected:
   friend class ChildProcess;
 
   // Called when the process refcount is 0.
   void OnProcessFinalRelease();
 
-  // Implemented by subclasses to attach ConnectionFilters to the thread's
-  // shell connection.
-  virtual void AddConnectionFilters(MojoShellConnection* connection);
+  // Called by subclasses to manually start the MojoShellConnection. Must only
+  // be called if ChildThreadImpl::Options::auto_start_mojo_shell_connection
+  // was set to |false| on ChildThreadImpl construction.
+  void StartMojoShellConnection();
 
   virtual bool OnControlMessageReceived(const IPC::Message& msg);
   virtual void OnProcessBackgrounded(bool backgrounded);
   virtual void OnProcessPurgeAndSuspend();
 
   // IPC::Listener implementation:
   bool OnMessageReceived(const IPC::Message& msg) override;
   void OnChannelConnected(int32_t peer_pid) override;
   void OnChannelError() override;
 
@@ skipping 97 matching lines @@
 };
 
 struct ChildThreadImpl::Options {
   Options(const Options& other);
   ~Options();
 
   class Builder;
 
   std::string channel_name;
   bool use_mojo_channel;
+  bool auto_start_mojo_shell_connection;
   scoped_refptr<base::SequencedTaskRunner> browser_process_io_runner;
   std::vector<IPC::MessageFilter*> startup_filters;
   std::string in_process_ipc_token;
   std::string in_process_application_token;
 
  private:
   Options();
 };
 
 class ChildThreadImpl::Options::Builder {
  public:
   Builder();
 
   Builder& InBrowserProcess(const InProcessChildThreadParams& params);
   Builder& UseMojoChannel(bool use_mojo_channel);
+  Builder& AutoStartMojoShellConnection(bool auto_start);
   Builder& WithChannelName(const std::string& channel_name);
   Builder& AddStartupFilter(IPC::MessageFilter* filter);
 
   Options Build();
 
  private:
   struct Options options_;
 
   DISALLOW_COPY_AND_ASSIGN(Builder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_CHILD_THREAD_IMPL_H_