Change primordial pipes to ShellClient

mojo/shell/runner/host/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 MOJO_SHELL_RUNNER_HOST_CHILD_PROCESS_HOST_H_
 #define MOJO_SHELL_RUNNER_HOST_CHILD_PROCESS_HOST_H_
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/callback.h"
+#include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "mojo/shell/public/cpp/identity.h"
 #include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
 #include "mojo/shell/runner/host/child_process_host.h"
 
@@ skipping 26 matching lines @@
   // mojo application we wish to start.
   ChildProcessHost(base::TaskRunner* launch_process_runner,
                    NativeRunnerDelegate* delegate,
                    bool start_sandboxed,
                    const Identity& target,
                    const base::FilePath& app_path);
   virtual ~ChildProcessHost();
 
   // |Start()|s the child process; calls |DidStart()| (on the thread on which
   // |Start()| was called) when the child has been started (or failed to start).
-  void Start(mojom::ShellClientRequest request,
-             const String& name,
-             const ProcessReadyCallback& callback,
-             const base::Closure& quit_closure);
+  mojom::ShellClientPtr Start(const String& name,
+                              const ProcessReadyCallback& callback,
+                              const base::Closure& quit_closure);
 
   // Waits for the child process to terminate.
   void Join();
 
  protected:
   void DidStart(const ProcessReadyCallback& callback);
 
  private:
-  void DoLaunch();
+  void DoLaunch(scoped_ptr<base::CommandLine> child_command_line);
 
   scoped_refptr<base::TaskRunner> launch_process_runner_;
   NativeRunnerDelegate* delegate_ = nullptr;
   bool start_sandboxed_ = false;
   Identity target_;
   const base::FilePath app_path_;
   base::Process child_process_;
-  // Used for the ShellClientFactory binding.
-  edk::PlatformChannelPair platform_channel_pair_;
-  mojom::ShellClientFactoryPtr factory_;
+
+  // Used to initialize the Mojo IPC channel between parent and child.
+  scoped_ptr<edk::PlatformChannelPair> mojo_ipc_channel_;
   edk::HandlePassingInformation handle_passing_info_;
 
-  // Used to back the NodeChannel between the parent and child node.
-  scoped_ptr<edk::PlatformChannelPair> node_channel_;
-
   // Since Start() calls a method on another thread, we use an event to block
   // the main thread if it tries to destruct |this| while launching the process.
   base::WaitableEvent start_child_process_event_;
 
-  // A token the child can use to connect a primordial pipe to the host.
-  std::string primordial_pipe_token_;
-
   base::WeakPtrFactory<ChildProcessHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessHost);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_RUNNER_HOST_CHILD_PROCESS_HOST_H_