Rename mojo::TokenSerializer to mojo::Broker.

mojo/edk/system/message_pipe_dispatcher.cc

 // Copyright 2015 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/message_pipe_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/embedder/platform_handle_utils.h"
 #include "mojo/edk/embedder/platform_shared_buffer.h"
 #include "mojo/edk/embedder/platform_support.h"
+#include "mojo/edk/system/broker.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/message_in_transit.h"
 #include "mojo/edk/system/options_validation.h"
 #include "mojo/edk/system/transport_data.h"
 
-#if defined(OS_WIN)
-#include "mojo/edk/system/token_serializer_win.h"
-#endif
-
 namespace mojo {
 namespace edk {
 
 // TODO(jam): do more tests on using channel on same thread if it supports it (
 // i.e. with USE_CHROME_EDK and Windows). Also see ipc_channel_mojo.cc
 bool g_use_channel_on_io_thread_only = true;
 
 namespace {
 
 const size_t kInvalidMessagePipeHandleIndex = static_cast<size_t>(-1);
@@ skipping 142 matching lines @@
 // (since we can be sure that the shell will respond to our IPCs, compared to
 // the other end where we're sending the MP to, which may not be reading...).
 ScopedPlatformHandleVectorPtr GetReadPlatformHandles(
     size_t num_platform_handles,
     const void* platform_handle_table) {
   ScopedPlatformHandleVectorPtr rv(new PlatformHandleVector());
   rv->resize(num_platform_handles);
 
   const uint64_t* tokens =
       static_cast<const uint64_t*>(platform_handle_table);
-  internal::g_token_serializer->TokenToHandle(
-      tokens, num_platform_handles, &rv->at(0));
+  internal::g_broker->TokenToHandle(tokens, num_platform_handles, &rv->at(0));
   return rv.Pass();
 }
 #endif
 
 scoped_refptr<MessagePipeDispatcher> MessagePipeDispatcher::Deserialize(
     const void* source,
     size_t size,
     PlatformHandleVector* platform_handles) {
   if (size != sizeof(SerializedMessagePipeHandleDispatcher)) {
     LOG(ERROR) << "Invalid serialized message pipe dispatcher (bad size)";
@@ skipping 237 matching lines @@
     // cont'd
     if (transport_data_buffer_size != 0) {
       // TODO(jam): copied from RawChannelWin::WriteNoLock(
       PlatformHandleVector* all_platform_handles =
           message->transport_data()->platform_handles();
       if (all_platform_handles) {
 #if defined(OS_WIN)
         uint64_t* tokens = reinterpret_cast<uint64_t*>(
             static_cast<char*>(message->transport_data()->buffer()) +
             message->transport_data()->platform_handle_table_offset());
-        internal::g_token_serializer->HandleToToken(
+        internal::g_broker->HandleToToken(
             &all_platform_handles->at(0), all_platform_handles->size(), tokens);
         for (size_t i = 0; i < all_platform_handles->size(); i++)
           all_platform_handles->at(i) = PlatformHandle();
 #else
         for (size_t i = 0; i < all_platform_handles->size(); i++) {
           serialized_fds_.push_back(all_platform_handles->at(i).fd);
           serialized_message_fds_length_++;
           all_platform_handles->at(i) = PlatformHandle();
         }
 #endif
@@ skipping 400 matching lines @@
       LOG(WARNING) << "Enqueueing null dispatcher";
       dispatchers->push_back(nullptr);
     }
   }
   message->SetDispatchers(dispatchers.Pass());
   return MOJO_RESULT_OK;
 }
 
 }  // namespace edk
 }  // namespace mojo