Switch to standard integer types in components/, part 2 of 4.

components/nacl/loader/nacl_ipc_adapter.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 "components/nacl/loader/nacl_ipc_adapter.h"
 
 #include <limits.h>
 #include <string.h>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/task_runner_util.h"
 #include "base/tuple.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_platform_file.h"
 #include "native_client/src/public/nacl_desc.h"
 #include "native_client/src/public/nacl_desc_custom.h"
 #include "native_client/src/trusted/desc/nacl_desc_quota.h"
@@ skipping 17 matching lines @@
   // The buffer contains a full message + extra data.
   MESSAGE_HAS_EXTRA_DATA
 };
 
 BufferSizeStatus GetBufferStatus(const char* data, size_t len) {
   if (len < sizeof(NaClIPCAdapter::NaClMessageHeader))
     return MESSAGE_IS_TRUNCATED;
 
   const NaClIPCAdapter::NaClMessageHeader* header =
       reinterpret_cast<const NaClIPCAdapter::NaClMessageHeader*>(data);
-  uint32 message_size =
+  uint32_t message_size =
       sizeof(NaClIPCAdapter::NaClMessageHeader) + header->payload_size;
 
   if (len == message_size)
     return MESSAGE_IS_COMPLETE;
   if (len > message_size)
     return MESSAGE_HAS_EXTRA_DATA;
   return MESSAGE_IS_TRUNCATED;
 }
 
 //------------------------------------------------------------------------------
@@ skipping 628 matching lines @@
   struct NaClDesc* desc =
       NaClDescCreateWithFilePathMetadata(handle, file_path_str.c_str());
   rewritten_msg->AddDescriptor(new NaClDescWrapper(desc));
   {
     base::AutoLock lock(lock_);
     SaveMessage(*new_msg, rewritten_msg.get());
     cond_var_.Signal();
   }
 }
 
-void NaClIPCAdapter::OnChannelConnected(int32 peer_pid) {
-}
+void NaClIPCAdapter::OnChannelConnected(int32_t peer_pid) {}
 
 void NaClIPCAdapter::OnChannelError() {
   CloseChannel();
 }
 
 NaClIPCAdapter::~NaClIPCAdapter() {
   // Make sure the channel is deleted on the IO thread.
   task_runner_->PostTask(FROM_HERE,
       base::Bind(&DeleteChannel, io_thread_data_.channel_.release()));
 }
@@ skipping 116 matching lines @@
 
 void NaClIPCAdapter::SaveMessage(const IPC::Message& msg,
                                  RewrittenMessage* rewritten_msg) {
   lock_.AssertAcquired();
   // There is some padding in this structure (the "padding" member is 16
   // bits but this then gets padded to 32 bits). We want to be sure not to
   // leak data to the untrusted plugin, so zero everything out first.
   NaClMessageHeader header;
   memset(&header, 0, sizeof(NaClMessageHeader));
 
-  header.payload_size = static_cast<uint32>(msg.payload_size());
+  header.payload_size = static_cast<uint32_t>(msg.payload_size());
   header.routing = msg.routing_id();
   header.type = msg.type();
   header.flags = msg.flags();
-  header.num_fds = static_cast<uint16>(rewritten_msg->desc_count());
+  header.num_fds = static_cast<uint16_t>(rewritten_msg->desc_count());
 
   rewritten_msg->SetData(header, msg.payload(), msg.payload_size());
   locked_data_.to_be_received_.push(rewritten_msg);
 }
 
 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags) {
   return TranslatePepperFileReadWriteOpenFlags(pp_open_flags);
 }