Revert "Revert "Make shell child processes slaves.""

shell/child_process_host.h

 // Copyright 2014 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 SHELL_CHILD_PROCESS_HOST_H_
 #define SHELL_CHILD_PROCESS_HOST_H_
 
 #include <stdint.h>
 
+#include <string>
+
 #include "base/macros.h"
 #include "base/process/process.h"
 #include "mojo/edk/embedder/channel_info_forward.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "shell/child_controller.mojom.h"
 
 namespace shell {
 
@@ skipping 37 matching lines @@
   void ExitNow(int32_t exit_code);
 
   // TODO(vtl): This is virtual, so tests can override it, but really |Start()|
   // should take a callback (see above) and this should be private.
   virtual void DidStart(bool success);
 
  private:
   // Callback for |mojo::embedder::CreateChannel()|.
   void DidCreateChannel(mojo::embedder::ChannelInfo* channel_info);
 
-  bool DoLaunch();
+  bool DoLaunch(const std::string& child_connection_id);
 
   void AppCompleted(int32_t result);
 
   // |mojo::ErrorHandler| methods:
   void OnConnectionError() override;
 
   Context* const context_;
   mojo::embedder::PlatformChannelPair platform_channel_pair_;
 
   ChildControllerPtr controller_;
   mojo::embedder::ChannelInfo* channel_info_;
   ChildController::StartAppCallback on_app_complete_;
 
   base::Process child_process_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessHost);
 };
 
 }  // namespace shell
 
 #endif  // SHELL_CHILD_PROCESS_HOST_H_