Rename mojo::TokenSerializer to mojo::Broker.

mojo/edk/system/core.cc

Index: mojo/edk/system/core.cc
diff --git a/mojo/edk/system/core.cc b/mojo/edk/system/core.cc
index af9d151cc9198fb4932c36672fdadda5cd583387..77b06f0cc4ac549eda110c66ef1a2655a3957df2 100644
--- a/mojo/edk/system/core.cc
+++ b/mojo/edk/system/core.cc
@@ -13,6 +13,7 @@
 #include "mojo/edk/embedder/platform_shared_buffer.h"
 #include "mojo/edk/embedder/platform_support.h"
 #include "mojo/edk/system/async_waiter.h"
+#include "mojo/edk/system/broker.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/data_pipe.h"
 #include "mojo/edk/system/data_pipe_consumer_dispatcher.h"
@@ -25,10 +26,6 @@
 #include "mojo/public/c/system/macros.h"
 #include "mojo/public/cpp/system/macros.h"
 
-#if defined(OS_WIN)
-#include "mojo/edk/system/token_serializer_win.h"
-#endif
-
 namespace mojo {
 namespace edk {
 
@@ -211,8 +208,7 @@ MojoResult Core::CreateMessagePipe(
 
   ScopedPlatformHandle server_handle, client_handle;
 #if defined(OS_WIN)
-  internal::g_token_serializer->CreatePlatformChannelPair(
-      &server_handle, &client_handle);
+  internal::g_broker->CreatePlatformChannelPair(&server_handle, &client_handle);
 #else
   PlatformChannelPair channel_pair;
   server_handle = channel_pair.PassServerHandle();
@@ -379,8 +375,7 @@ MojoResult Core::CreateDataPipe(
 
   ScopedPlatformHandle server_handle, client_handle;
 #if defined(OS_WIN)
-  internal::g_token_serializer->CreatePlatformChannelPair(
-      &server_handle, &client_handle);
+  internal::g_broker->CreatePlatformChannelPair(&server_handle, &client_handle);
 #else
   PlatformChannelPair channel_pair;
   server_handle = channel_pair.PassServerHandle();