Rename mojo::TokenSerializer to mojo::Broker.

mojo/edk/system/core.cc

 // Copyright 2013 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/edk/system/core.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #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"
 #include "mojo/edk/system/data_pipe_producer_dispatcher.h"
 #include "mojo/edk/system/dispatcher.h"
 #include "mojo/edk/system/handle_signals_state.h"
 #include "mojo/edk/system/message_pipe_dispatcher.h"
 #include "mojo/edk/system/shared_buffer_dispatcher.h"
 #include "mojo/edk/system/waiter.h"
 #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 {
 
 // Implementation notes
 //
 // Mojo primitives are implemented by the singleton |Core| object. Most calls
 // are for a "primary" handle (the first argument). |Core::GetDispatcher()| is
 // used to look up a |Dispatcher| object for a given handle. That object
 // implements most primitives for that object. The wait primitives are not
 // attached to objects and are implemented by |Core| itself.
@@ skipping 162 matching lines @@
   if (handle_pair.first == MOJO_HANDLE_INVALID) {
     DCHECK_EQ(handle_pair.second, MOJO_HANDLE_INVALID);
     LOG(ERROR) << "Handle table full";
     dispatcher0->Close();
     dispatcher1->Close();
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
   }
 
   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();
   client_handle = channel_pair.PassClientHandle();
 #endif
   dispatcher0->Init(server_handle.Pass(), nullptr, 0u, nullptr, 0u, nullptr,
                     nullptr);
   dispatcher1->Init(client_handle.Pass(), nullptr, 0u, nullptr, 0u, nullptr,
                     nullptr);
 
@@ skipping 146 matching lines @@
     DCHECK_EQ(handle_pair.second, MOJO_HANDLE_INVALID);
     LOG(ERROR) << "Handle table full";
     producer_dispatcher->Close();
     consumer_dispatcher->Close();
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
   }
   DCHECK_NE(handle_pair.second, MOJO_HANDLE_INVALID);
 
   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();
   client_handle = channel_pair.PassClientHandle();
 #endif
   producer_dispatcher->Init(server_handle.Pass(), nullptr, 0u);
   consumer_dispatcher->Init(client_handle.Pass(), nullptr, 0u);
 
   *data_pipe_producer_handle = handle_pair.first;
   *data_pipe_consumer_handle = handle_pair.second;
@@ skipping 217 matching lines @@
   if (signals_states) {
     for (; i < num_handles; i++)
       signals_states[i] = dispatchers[i]->GetHandleSignalsState();
   }
 
   return rv;
 }
 
 }  // namespace edk
 }  // namespace mojo