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

Index: mojo/runner/host/child_process_host.h
diff --git a/mojo/runner/host/child_process_host.h b/mojo/runner/host/child_process_host.h
index a4d15103029413c303f3524e7442fe6bc04eb1bf..1d02cd4cfdae05f247d6ba1b9bfc897d9ac5a1cb 100644
--- a/mojo/runner/host/child_process_host.h
+++ b/mojo/runner/host/child_process_host.h
@@ -10,6 +10,8 @@
 #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"
@@ -70,14 +72,22 @@ class ChildProcessHost {
   // 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.
@@ -85,7 +95,7 @@ class ChildProcessHost {
 
   // 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_;