Rename mojo::TokenSerializer to mojo::Broker.

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"
@@ skipping 65 matching lines @@
   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.
+  // Broker.
   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_;
 
   // A message pipe to the child process. Valid immediately after creation.
   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_