Rename mojo::TokenSerializer to mojo::Broker.

mojo/edk/embedder/embedder.h

Index: mojo/edk/embedder/embedder.h
diff --git a/mojo/edk/embedder/embedder.h b/mojo/edk/embedder/embedder.h
index 52cca506898a9c1272db47f581d40c817f863fc7..5ba244990dfadceb06ebaa72a5555ffff89645b3 100644
--- a/mojo/edk/embedder/embedder.h
+++ b/mojo/edk/embedder/embedder.h
@@ -10,7 +10,7 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/process/process.h"
+#include "base/process/process_handle.h"
 #include "base/task_runner.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/system/system_impl_export.h"
@@ -30,7 +30,6 @@ class ProcessDelegate;
 // Allows changing the default max message size. Must be called before Init.
 MOJO_SYSTEM_IMPL_EXPORT void SetMaxMessageSize(size_t bytes);
 
-#if defined(OS_WIN)
 // Must be called before Init in the parent (unsandboxed) process.
 MOJO_SYSTEM_IMPL_EXPORT void PreInitializeParentProcess();
 
@@ -40,16 +39,16 @@ MOJO_SYSTEM_IMPL_EXPORT void PreInitializeChildProcess();
 // Called in the parent process for each child process that is launched. The
 // returned handle must be sent to the child process which then calls
 // SetParentPipeHandle.
-MOJO_SYSTEM_IMPL_EXPORT HANDLE ChildProcessLaunched(HANDLE child_process);
+MOJO_SYSTEM_IMPL_EXPORT ScopedPlatformHandle ChildProcessLaunched(
+    base::ProcessHandle child_process);
 // Like above, except used when the embedder establishes the pipe between the
 // parent and child processes itself.
-MOJO_SYSTEM_IMPL_EXPORT void ChildProcessLaunched(HANDLE child_process,
-                                                  HANDLE server_pipe);
+MOJO_SYSTEM_IMPL_EXPORT void ChildProcessLaunched(
+    base::ProcessHandle child_process, ScopedPlatformHandle server_pipe);
 
 // Should be called as early as possible in the child process with the handle
 // that the parent received from ChildProcessLaunched.
-MOJO_SYSTEM_IMPL_EXPORT void SetParentPipeHandle(HANDLE pipe);
-#endif
+MOJO_SYSTEM_IMPL_EXPORT void SetParentPipeHandle(ScopedPlatformHandle pipe);
 
 // Must be called first, or just after setting configuration parameters, to
 // initialize the (global, singleton) system.