Rename mojo::TokenSerializer to mojo::Broker.

mojo/runner/host/child_process_host.cc

 // 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.
 
 #include "mojo/runner/host/child_process_host.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 22 matching lines @@
 ChildProcessHost::ChildProcessHost(base::TaskRunner* launch_process_runner,
                                    bool start_sandboxed,
                                    const base::FilePath& app_path)
     : launch_process_runner_(launch_process_runner),
       start_sandboxed_(start_sandboxed),
       app_path_(app_path),
       channel_info_(nullptr),
       start_child_process_event_(false, false),
       weak_factory_(this) {
 #if defined(OS_WIN)
+  // TODO(jam): enable on POSIX
   if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk"))
     serializer_platform_channel_pair_.reset(new edk::PlatformChannelPair(true));
 #endif
 
   child_message_pipe_ = embedder::CreateChannel(
       platform_channel_pair_.PassServerHandle(),
       base::Bind(&ChildProcessHost::DidCreateChannel, base::Unretained(this)),
       base::ThreadTaskRunnerHandle::Get());
 }
 
@@ skipping 150 matching lines @@
 #endif
     child_process_ = base::LaunchProcess(child_command_line, options);
 
   if (child_process_.IsValid()) {
     platform_channel_pair_.ChildProcessLaunched();
 #if defined(OS_WIN)
     if (serializer_platform_channel_pair_.get()) {
       serializer_platform_channel_pair_->ChildProcessLaunched();
       mojo::embedder::ChildProcessLaunched(
           child_process_.Handle(),
-          serializer_platform_channel_pair_->PassServerHandle()
-              .release()
-              .handle);
+          mojo::embedder::ScopedPlatformHandle(mojo::embedder::PlatformHandle(
+              serializer_platform_channel_pair_->PassServerHandle().release().
+#if defined(OS_WIN)
+                  handle
+#else
+                  fd
+#endif
+            )));
     }
 #endif
   }
   start_child_process_event_.Signal();
 }
 
 void ChildProcessHost::AppCompleted(int32_t result) {
   if (!on_app_complete_.is_null()) {
     auto on_app_complete = on_app_complete_;
     on_app_complete_.reset();
     on_app_complete.Run(result);
   }
 }
 
 void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) {
   DVLOG(2) << "AppChildProcessHost::DidCreateChannel()";
 
   DCHECK(channel_info ||
          base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk"));
   channel_info_ = channel_info;
 }
 
 }  // namespace runner
 }  // namespace mojo