Create a broker interface for the new Mojo EDK so that the browser can create and duplicate messa...

mojo/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_RUNNER_HOST_CHILD_PROCESS_HOST_H_
 #define MOJO_RUNNER_HOST_CHILD_PROCESS_HOST_H_
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/process/process.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/runner/child/child_controller.mojom.h"
 #include "mojo/runner/host/child_process_host.h"
 #include "third_party/mojo/src/mojo/edk/embedder/channel_info_forward.h"
 #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h"
 #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h"
 
 namespace base {
 class TaskRunner;
 }
 
@@ skipping 40 matching lines @@
   virtual void DidStart();
 
  private:
   void DoLaunch();
 
   void AppCompleted(int32_t result);
 
   // Callback for |embedder::CreateChannel()|.
   void DidCreateChannel(embedder::ChannelInfo* channel_info);
 
-  base::TaskRunner* const launch_process_runner_;
+  scoped_refptr<base::TaskRunner> launch_process_runner_;
   bool start_sandboxed_;
   const base::FilePath app_path_;
   base::Process child_process_;
+  // Used for the ChildController binding.
   embedder::PlatformChannelPair platform_channel_pair_;
   ChildControllerPtr controller_;
   embedder::ChannelInfo* channel_info_;
   ChildController::StartAppCallback on_app_complete_;
+  embedder::HandlePassingInformation handle_passing_info_;
+
+#if defined(OS_WIN)
+  // Used only when --use-new-edk is specified, as a communication channel for
+  // TokenSerializer.
+  scoped_ptr<edk::PlatformChannelPair> serializer_platform_channel_pair_;
+#endif
 
   // 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_;
 
   // Platform-specific "pipe" to the child process. Valid immediately after

[yzshen1, 2015/11/20 20:39:55]

nit: Please update the comment since it is no longer "platform-specific pipe".

[jam, 2015/11/21 01:26:09]

Done.

   // creation.
-  embedder::ScopedPlatformHandle platform_channel_;
+  mojo::ScopedMessagePipeHandle child_message_pipe_;
 
   base::WeakPtrFactory<ChildProcessHost> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildProcessHost);
 };
 
 }  // namespace runner
 }  // namespace mojo
 
 #endif  // MOJO_RUNNER_HOST_CHILD_PROCESS_HOST_H_