Switch to standard integer types in ppapi/.

BUG=138542
TBR=bbudge@chromium.org
NOPRESUBMIT=true

Review URL: https://codereview.chromium.org/1548813002

Cr-Commit-Position: refs/heads/master@{#366718}

64 files changed, 215 insertions, 124 deletions

diff --git a/ppapi/shared_impl/array_var.h b/ppapi/shared_impl/array_var.h
index 2e3ab02..bce8416 100644
--- a/ppapi/shared_impl/array_var.h
+++ b/ppapi/shared_impl/array_var.h
@@ -5,10 +5,12 @@
 #ifndef PPAPI_SHARED_IMPL_ARRAY_VAR_H_
 #define PPAPI_SHARED_IMPL_ARRAY_VAR_H_
 
+#include <stdint.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 #include "ppapi/shared_impl/scoped_pp_var.h"
diff --git a/ppapi/shared_impl/array_writer.cc b/ppapi/shared_impl/array_writer.cc
index fe87e07..e984715 100644
--- a/ppapi/shared_impl/array_writer.cc
+++ b/ppapi/shared_impl/array_writer.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/shared_impl/array_writer.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 
 #include "ppapi/shared_impl/ppapi_globals.h"
diff --git a/ppapi/shared_impl/array_writer.h b/ppapi/shared_impl/array_writer.h
index 1d2608a..a301dcc 100644
--- a/ppapi/shared_impl/array_writer.h
+++ b/ppapi/shared_impl/array_writer.h
@@ -5,10 +5,12 @@
 #ifndef PPAPI_SHARED_IMPL_ARRAY_WRITER_H_
 #define PPAPI_SHARED_IMPL_ARRAY_WRITER_H_
 
+#include <stdint.h>
 #include <string.h>
 
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_array_output.h"
 #include "ppapi/c/pp_resource.h"
diff --git a/ppapi/shared_impl/callback_tracker.h b/ppapi/shared_impl/callback_tracker.h
index bafd818..3b91038 100644
--- a/ppapi/shared_impl/callback_tracker.h
+++ b/ppapi/shared_impl/callback_tracker.h
@@ -8,7 +8,7 @@
 #include <map>
 #include <set>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "ppapi/c/pp_resource.h"
diff --git a/ppapi/shared_impl/compositor_layer_data.h b/ppapi/shared_impl/compositor_layer_data.h
index d726e28..86a5b59 100644
--- a/ppapi/shared_impl/compositor_layer_data.h
+++ b/ppapi/shared_impl/compositor_layer_data.h
@@ -5,6 +5,7 @@
 #ifndef PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_
 #define PPAPI_SHARED_IMPL_COMPOSITOR_LAYER_DATA_H_
 
+#include <stdint.h>
 #include <string.h>
 
 #include "base/logging.h"
diff --git a/ppapi/shared_impl/dictionary_var.h b/ppapi/shared_impl/dictionary_var.h
index 06f9502..d6b610a 100644
--- a/ppapi/shared_impl/dictionary_var.h
+++ b/ppapi/shared_impl/dictionary_var.h
@@ -8,8 +8,8 @@
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 #include "ppapi/shared_impl/scoped_pp_var.h"
diff --git a/ppapi/shared_impl/file_io_state_manager.h b/ppapi/shared_impl/file_io_state_manager.h
index 1c4fa1a..8e1e978 100644
--- a/ppapi/shared_impl/file_io_state_manager.h
+++ b/ppapi/shared_impl/file_io_state_manager.h
@@ -5,8 +5,8 @@
 #ifndef PPAPI_SHARED_IMPL_FILE_IO_STATE_MANAGER_H_
 #define PPAPI_SHARED_IMPL_FILE_IO_STATE_MANAGER_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
diff --git a/ppapi/shared_impl/file_ref_create_info.cc b/ppapi/shared_impl/file_ref_create_info.cc
index 7d975b7..f4b78c1 100644
--- a/ppapi/shared_impl/file_ref_create_info.cc
+++ b/ppapi/shared_impl/file_ref_create_info.cc
@@ -4,8 +4,11 @@
 
 #include "ppapi/shared_impl/file_ref_create_info.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "ppapi/c/pp_file_info.h"
 
 namespace ppapi {
diff --git a/ppapi/shared_impl/file_ref_util.cc b/ppapi/shared_impl/file_ref_util.cc
index a5523cb..d111f69 100644
--- a/ppapi/shared_impl/file_ref_util.cc
+++ b/ppapi/shared_impl/file_ref_util.cc
@@ -4,9 +4,12 @@
 
 #include "ppapi/shared_impl/file_ref_util.h"
 
+#include <stddef.h>
+
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 
 namespace ppapi {
 
diff --git a/ppapi/shared_impl/flash_clipboard_format_registry.cc b/ppapi/shared_impl/flash_clipboard_format_registry.cc
index fa43478..16da30c 100644
--- a/ppapi/shared_impl/flash_clipboard_format_registry.cc
+++ b/ppapi/shared_impl/flash_clipboard_format_registry.cc
@@ -4,8 +4,11 @@
 
 #include "ppapi/shared_impl/flash_clipboard_format_registry.h"
 
+#include <stddef.h>
+
 #include <cctype>
 
+#include "base/macros.h"
 #include "base/numerics/safe_conversions.h"
 
 namespace ppapi {
diff --git a/ppapi/shared_impl/flash_clipboard_format_registry.h b/ppapi/shared_impl/flash_clipboard_format_registry.h
index 9e9ae30..1d6a3ef 100644
--- a/ppapi/shared_impl/flash_clipboard_format_registry.h
+++ b/ppapi/shared_impl/flash_clipboard_format_registry.h
@@ -5,10 +5,12 @@
 #ifndef PPAPI_SHARED_IMPL_FLASH_CLIPBOARD_FORMAT_REGISTRY_H_
 #define PPAPI_SHARED_IMPL_FLASH_CLIPBOARD_FORMAT_REGISTRY_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ppapi/c/private/ppb_flash_clipboard.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
diff --git a/ppapi/shared_impl/id_assignment.h b/ppapi/shared_impl/id_assignment.h
index 4ca8cd1..1444f2f 100644
--- a/ppapi/shared_impl/id_assignment.h
+++ b/ppapi/shared_impl/id_assignment.h
@@ -5,9 +5,10 @@
 #ifndef PPAPI_SHARED_IMPL_ID_ASSIGNMENT_H_
 #define PPAPI_SHARED_IMPL_ID_ASSIGNMENT_H_
 
+#include <stdint.h>
+
 #include <limits>
 
-#include "base/basictypes.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
 namespace ppapi {
@@ -24,7 +25,7 @@ enum PPIdType {
 
 PPAPI_SHARED_EXPORT extern const unsigned int kPPIdTypeBits;
 
-extern const int32 kMaxPPId;
+extern const int32_t kMaxPPId;
 
 // The least significant bits are the type, the rest are the value.
 template <typename T>
diff --git a/ppapi/shared_impl/media_stream_audio_track_shared.h b/ppapi/shared_impl/media_stream_audio_track_shared.h
index 8d9cbe5..8a7a000 100644
--- a/ppapi/shared_impl/media_stream_audio_track_shared.h
+++ b/ppapi/shared_impl/media_stream_audio_track_shared.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_SHARED_IMPL_MEDIA_STREAM_AUDIO_TRACK_SHARED_H_
 #define PPAPI_SHARED_IMPL_MEDIA_STREAM_AUDIO_TRACK_SHARED_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_audio_buffer.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
diff --git a/ppapi/shared_impl/media_stream_buffer.h b/ppapi/shared_impl/media_stream_buffer.h
index ddb6729..5a3b631 100644
--- a/ppapi/shared_impl/media_stream_buffer.h
+++ b/ppapi/shared_impl/media_stream_buffer.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_H_
 #define PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_audio_buffer.h"
 #include "ppapi/c/ppb_video_frame.h"
 
diff --git a/ppapi/shared_impl/media_stream_buffer_manager.cc b/ppapi/shared_impl/media_stream_buffer_manager.cc
index b1b6516..db97263 100644
--- a/ppapi/shared_impl/media_stream_buffer_manager.cc
+++ b/ppapi/shared_impl/media_stream_buffer_manager.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/shared_impl/media_stream_buffer_manager.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "base/logging.h"
diff --git a/ppapi/shared_impl/media_stream_buffer_manager.h b/ppapi/shared_impl/media_stream_buffer_manager.h
index 7633624..d965b11 100644
--- a/ppapi/shared_impl/media_stream_buffer_manager.h
+++ b/ppapi/shared_impl/media_stream_buffer_manager.h
@@ -5,10 +5,13 @@
 #ifndef PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_MANAGER_H_
 #define PPAPI_SHARED_IMPL_MEDIA_STREAM_BUFFER_MANAGER_H_
 
+#include <stdint.h>
+
 #include <deque>
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
diff --git a/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc b/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc
index dfe35d1..4bb250a 100644
--- a/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc
+++ b/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/shared_impl/media_stream_buffer_manager.h"
 
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/memory/scoped_ptr.h"
diff --git a/ppapi/shared_impl/media_stream_video_track_shared.h b/ppapi/shared_impl/media_stream_video_track_shared.h
index 75e32b8..14aa29f 100644
--- a/ppapi/shared_impl/media_stream_video_track_shared.h
+++ b/ppapi/shared_impl/media_stream_video_track_shared.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_SHARED_IMPL_MEDIA_STREAM_VIDEO_TRACK_SHARED_H_
 #define PPAPI_SHARED_IMPL_MEDIA_STREAM_VIDEO_TRACK_SHARED_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/ppb_video_frame.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
diff --git a/ppapi/shared_impl/media_stream_video_track_shared_unittest.cc b/ppapi/shared_impl/media_stream_video_track_shared_unittest.cc
index 55b0119..684d434 100644
--- a/ppapi/shared_impl/media_stream_video_track_shared_unittest.cc
+++ b/ppapi/shared_impl/media_stream_video_track_shared_unittest.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include "ppapi/shared_impl/media_stream_video_track_shared.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/ppapi/shared_impl/platform_file.cc b/ppapi/shared_impl/platform_file.cc
index 0bdd5db..68afe97 100644
--- a/ppapi/shared_impl/platform_file.cc
+++ b/ppapi/shared_impl/platform_file.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "build/build_config.h"
 #include "ppapi/shared_impl/platform_file.h"
 
 namespace ppapi {
diff --git a/ppapi/shared_impl/ppapi_constants.h b/ppapi/shared_impl/ppapi_constants.h
index d5b71aa..118db25 100644
--- a/ppapi/shared_impl/ppapi_constants.h
+++ b/ppapi/shared_impl/ppapi_constants.h
@@ -5,6 +5,7 @@
 #ifndef PPAPI_SHARED_IMPL_PPAPI_CONSTANTS_H_
 #define PPAPI_SHARED_IMPL_PPAPI_CONSTANTS_H_
 
+#include "build/build_config.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
 namespace ppapi {
diff --git a/ppapi/shared_impl/ppapi_globals.h b/ppapi/shared_impl/ppapi_globals.h
index 14b386e..f069ab0 100644
--- a/ppapi/shared_impl/ppapi_globals.h
+++ b/ppapi/shared_impl/ppapi_globals.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/thread_local.h"  // For testing purposes only.
 #include "ppapi/c/pp_instance.h"
diff --git a/ppapi/shared_impl/ppapi_permissions.cc b/ppapi/shared_impl/ppapi_permissions.cc
index a2d2521..cf0e90c 100644
--- a/ppapi/shared_impl/ppapi_permissions.cc
+++ b/ppapi/shared_impl/ppapi_permissions.cc
@@ -6,13 +6,14 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "ppapi/shared_impl/ppapi_switches.h"
 
 namespace ppapi {
 
 PpapiPermissions::PpapiPermissions() : permissions_(0) {}
 
-PpapiPermissions::PpapiPermissions(uint32 perms) : permissions_(perms) {}
+PpapiPermissions::PpapiPermissions(uint32_t perms) : permissions_(perms) {}
 
 PpapiPermissions::~PpapiPermissions() {}
 
@@ -22,8 +23,8 @@ PpapiPermissions PpapiPermissions::AllPermissions() {
 }
 
 // static
-PpapiPermissions PpapiPermissions::GetForCommandLine(uint32 base_perms) {
-  uint32 additional_permissions = 0;
+PpapiPermissions PpapiPermissions::GetForCommandLine(uint32_t base_perms) {
+  uint32_t additional_permissions = 0;
 
 #if !defined(OS_NACL)
   // Testing permissions. The testing flag implies all permissions since the
@@ -41,7 +42,7 @@ bool PpapiPermissions::HasPermission(Permission perm) const {
   // more than one permission bit. We may want to change how permissions are
   // represented in the future so don't want callers making assumptions about
   // bits.
-  uint32 perm_int = static_cast<uint32>(perm);
+  uint32_t perm_int = static_cast<uint32_t>(perm);
   if (!perm_int)
     return true;  // You always have "no permission".
   DCHECK((perm_int & (perm_int - 1)) == 0);
diff --git a/ppapi/shared_impl/ppapi_permissions.h b/ppapi/shared_impl/ppapi_permissions.h
index 8a12206b9..346959f 100644
--- a/ppapi/shared_impl/ppapi_permissions.h
+++ b/ppapi/shared_impl/ppapi_permissions.h
@@ -5,7 +5,8 @@
 #ifndef PPAPI_SHARED_IMPL_PPAPI_PERMISSIONS_H_
 #define PPAPI_SHARED_IMPL_PPAPI_PERMISSIONS_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
 namespace ppapi {
@@ -53,7 +54,7 @@ class PPAPI_SHARED_EXPORT PpapiPermissions {
   PpapiPermissions();
 
   // Initializes with the given permissions bits set.
-  explicit PpapiPermissions(uint32 perms);
+  explicit PpapiPermissions(uint32_t perms);
 
   ~PpapiPermissions();
 
@@ -64,15 +65,15 @@ class PPAPI_SHARED_EXPORT PpapiPermissions {
   // Returns the effective permissions given the "base" permissions granted
   // to the given plugin and the current command line flags, which may enable
   // more features.
-  static PpapiPermissions GetForCommandLine(uint32 base_perms);
+  static PpapiPermissions GetForCommandLine(uint32_t base_perms);
 
   bool HasPermission(Permission perm) const;
 
   // Returns the internal permission bits. Use for serialization only.
-  uint32 GetBits() const { return permissions_; }
+  uint32_t GetBits() const { return permissions_; }
 
  private:
-  uint32 permissions_;
+  uint32_t permissions_;
 
   // Note: Copy & assign supported.
 };
diff --git a/ppapi/shared_impl/ppb_audio_config_shared.h b/ppapi/shared_impl/ppb_audio_config_shared.h
index 5e7d359..643d1e1 100644
--- a/ppapi/shared_impl/ppb_audio_config_shared.h
+++ b/ppapi/shared_impl/ppb_audio_config_shared.h
@@ -5,8 +5,10 @@
 #ifndef PPAPI_SHARED_IMPL_PPB_AUDIO_CONFIG_SHARED_H_
 #define PPAPI_SHARED_IMPL_PPB_AUDIO_CONFIG_SHARED_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_audio_config_api.h"
 
diff --git a/ppapi/shared_impl/ppb_audio_shared.h b/ppapi/shared_impl/ppb_audio_shared.h
index 31888c8..10b0500 100644
--- a/ppapi/shared_impl/ppb_audio_shared.h
+++ b/ppapi/shared_impl/ppb_audio_shared.h
@@ -5,6 +5,10 @@
 #ifndef PPAPI_SHARED_IMPL_PPB_AUDIO_SHARED_H_
 #define PPAPI_SHARED_IMPL_PPB_AUDIO_SHARED_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/sync_socket.h"
diff --git a/ppapi/shared_impl/ppb_crypto_shared.cc b/ppapi/shared_impl/ppb_crypto_shared.cc
index f172ea7..d5fd9ce 100644
--- a/ppapi/shared_impl/ppb_crypto_shared.cc
+++ b/ppapi/shared_impl/ppb_crypto_shared.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
+
 #include "base/rand_util.h"
 #include "ppapi/c/dev/ppb_crypto_dev.h"
 #include "ppapi/thunk/thunk.h"
diff --git a/ppapi/shared_impl/ppb_device_ref_shared.h b/ppapi/shared_impl/ppb_device_ref_shared.h
index aac1206..6a14881 100644
--- a/ppapi/shared_impl/ppb_device_ref_shared.h
+++ b/ppapi/shared_impl/ppb_device_ref_shared.h
@@ -7,8 +7,8 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_device_ref_api.h"
 
diff --git a/ppapi/shared_impl/ppb_gamepad_shared.cc b/ppapi/shared_impl/ppb_gamepad_shared.cc
index 2bf0b57..80082d0 100644
--- a/ppapi/shared_impl/ppb_gamepad_shared.cc
+++ b/ppapi/shared_impl/ppb_gamepad_shared.cc
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "base/basictypes.h"
 
 namespace ppapi {
 
diff --git a/ppapi/shared_impl/ppb_gamepad_shared.h b/ppapi/shared_impl/ppb_gamepad_shared.h
index 22b4df7..4628399 100644
--- a/ppapi/shared_impl/ppb_gamepad_shared.h
+++ b/ppapi/shared_impl/ppb_gamepad_shared.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_
 #define PPAPI_SHARED_IMPL_PPB_GAMEPAD_SHARED_H_
 
+#include <stddef.h>
+
 #include "base/atomicops.h"
 #include "base/strings/string16.h"
 #include "ppapi/c/ppb_gamepad.h"
diff --git a/ppapi/shared_impl/ppb_graphics_3d_shared.cc b/ppapi/shared_impl/ppb_graphics_3d_shared.cc
index 3dadacb..81b8949 100644
--- a/ppapi/shared_impl/ppb_graphics_3d_shared.cc
+++ b/ppapi/shared_impl/ppb_graphics_3d_shared.cc
@@ -100,8 +100,8 @@ bool PPB_Graphics3D_Shared::HasPendingSwap() const {
 }
 
 bool PPB_Graphics3D_Shared::CreateGLES2Impl(
-    int32 command_buffer_size,
-    int32 transfer_buffer_size,
+    int32_t command_buffer_size,
+    int32_t transfer_buffer_size,
     gpu::gles2::GLES2Implementation* share_gles2) {
   gpu::CommandBuffer* command_buffer = GetCommandBuffer();
   DCHECK(command_buffer);
@@ -113,8 +113,8 @@ bool PPB_Graphics3D_Shared::CreateGLES2Impl(
 
   // Create a transfer buffer used to copy resources between the renderer
   // process and the GPU process.
-  const int32 kMinTransferBufferSize = 256 * 1024;
-  const int32 kMaxTransferBufferSize = 16 * 1024 * 1024;
+  const int32_t kMinTransferBufferSize = 256 * 1024;
+  const int32_t kMaxTransferBufferSize = 16 * 1024 * 1024;
   transfer_buffer_.reset(new gpu::TransferBuffer(gles2_helper_.get()));
 
   const bool bind_creates_resources = true;
diff --git a/ppapi/shared_impl/ppb_graphics_3d_shared.h b/ppapi/shared_impl/ppb_graphics_3d_shared.h
index 09bc0f53..3401c42 100644
--- a/ppapi/shared_impl/ppb_graphics_3d_shared.h
+++ b/ppapi/shared_impl/ppb_graphics_3d_shared.h
@@ -5,7 +5,9 @@
 #ifndef PPAPI_SHARED_IMPL_GRAPHICS_3D_IMPL_H_
 #define PPAPI_SHARED_IMPL_GRAPHICS_3D_IMPL_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
@@ -63,11 +65,11 @@ class PPAPI_SHARED_EXPORT PPB_Graphics3D_Shared
 
   virtual gpu::CommandBuffer* GetCommandBuffer() = 0;
   virtual gpu::GpuControl* GetGpuControl() = 0;
-  virtual int32 DoSwapBuffers() = 0;
+  virtual int32_t DoSwapBuffers() = 0;
 
   bool HasPendingSwap() const;
-  bool CreateGLES2Impl(int32 command_buffer_size,
-                       int32 transfer_buffer_size,
+  bool CreateGLES2Impl(int32_t command_buffer_size,
+                       int32_t transfer_buffer_size,
                        gpu::gles2::GLES2Implementation* share_gles2);
   void DestroyGLES2Impl();
 
diff --git a/ppapi/shared_impl/ppb_input_event_shared.cc b/ppapi/shared_impl/ppb_input_event_shared.cc
index 5cf83b5..c966224 100644
--- a/ppapi/shared_impl/ppb_input_event_shared.cc
+++ b/ppapi/shared_impl/ppb_input_event_shared.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/shared_impl/ppb_input_event_shared.h"
 
+#include <stddef.h>
+
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var.h"
 
diff --git a/ppapi/shared_impl/ppb_input_event_shared.h b/ppapi/shared_impl/ppb_input_event_shared.h
index b3e8e61..cdebad7 100644
--- a/ppapi/shared_impl/ppb_input_event_shared.h
+++ b/ppapi/shared_impl/ppb_input_event_shared.h
@@ -5,11 +5,13 @@
 #ifndef PPAPI_SHARED_IMPL_PPB_INPUT_EVENT_SHARED_H_
 #define PPAPI_SHARED_IMPL_PPB_INPUT_EVENT_SHARED_H_
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ppapi/c/ppb_input_event.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/thunk/ppb_input_event_api.h"
diff --git a/ppapi/shared_impl/ppb_memory_shared.cc b/ppapi/shared_impl/ppb_memory_shared.cc
index aaf5f36..f870b71 100644
--- a/ppapi/shared_impl/ppb_memory_shared.cc
+++ b/ppapi/shared_impl/ppb_memory_shared.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
 #include <stdlib.h>
 
 #include "ppapi/c/dev/ppb_memory_dev.h"
diff --git a/ppapi/shared_impl/ppb_message_loop_shared.h b/ppapi/shared_impl/ppb_message_loop_shared.h
index d28d8be4..cd7733f 100644
--- a/ppapi/shared_impl/ppb_message_loop_shared.h
+++ b/ppapi/shared_impl/ppb_message_loop_shared.h
@@ -5,9 +5,11 @@
 #ifndef PPAPI_SHARED_IMPL_PPB_MESSAGE_LOOP_SHARED_H_
 #define PPAPI_SHARED_IMPL_PPB_MESSAGE_LOOP_SHARED_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/callback_forward.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 #include "ppapi/shared_impl/resource.h"
@@ -46,7 +48,7 @@ class PPAPI_SHARED_EXPORT MessageLoopShared
   //       proxy operations (e.g., MessageLoop::QuitClosure).
   virtual void PostClosure(const tracked_objects::Location& from_here,
                            const base::Closure& closure,
-                           int64 delay_ms) = 0;
+                           int64_t delay_ms) = 0;
 
   virtual base::SingleThreadTaskRunner* GetTaskRunner() = 0;
 
diff --git a/ppapi/shared_impl/ppb_trace_event_impl.cc b/ppapi/shared_impl/ppb_trace_event_impl.cc
index db9260b..a178726 100644
--- a/ppapi/shared_impl/ppb_trace_event_impl.cc
+++ b/ppapi/shared_impl/ppb_trace_event_impl.cc
@@ -4,7 +4,6 @@
 
 #include "ppapi/shared_impl/ppb_trace_event_impl.h"
 
-#include "base/basictypes.h"
 #include "base/threading/platform_thread.h"
 #include "base/trace_event/trace_event.h"
 #include "ppapi/thunk/thunk.h"
diff --git a/ppapi/shared_impl/ppb_trace_event_impl.h b/ppapi/shared_impl/ppb_trace_event_impl.h
index b7a5eb4..904e708 100644
--- a/ppapi/shared_impl/ppb_trace_event_impl.h
+++ b/ppapi/shared_impl/ppb_trace_event_impl.h
@@ -5,6 +5,8 @@
 #ifndef PPAPI_SHARED_IMPL_PPB_TRACE_EVENT_IMPL_H_
 #define PPAPI_SHARED_IMPL_PPB_TRACE_EVENT_IMPL_H_
 
+#include <stdint.h>
+
 #include "ppapi/c/dev/ppb_trace_event_dev.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
diff --git a/ppapi/shared_impl/ppb_url_util_shared.h b/ppapi/shared_impl/ppb_url_util_shared.h
index 907c4b8..6d81617 100644
--- a/ppapi/shared_impl/ppb_url_util_shared.h
+++ b/ppapi/shared_impl/ppb_url_util_shared.h
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "ppapi/c/dev/ppb_url_util_dev.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
diff --git a/ppapi/shared_impl/ppb_video_decoder_shared.cc b/ppapi/shared_impl/ppb_video_decoder_shared.cc
index 88c9ca2..a8863b8 100644
--- a/ppapi/shared_impl/ppb_video_decoder_shared.cc
+++ b/ppapi/shared_impl/ppb_video_decoder_shared.cc
@@ -70,23 +70,23 @@ bool PPB_VideoDecoder_Shared::SetResetCallback(
 }
 
 bool PPB_VideoDecoder_Shared::SetBitstreamBufferCallback(
-    int32 bitstream_buffer_id,
+    int32_t bitstream_buffer_id,
     scoped_refptr<TrackedCallback> callback) {
   return bitstream_buffer_callbacks_.insert(std::make_pair(bitstream_buffer_id,
                                                            callback)).second;
 }
 
-void PPB_VideoDecoder_Shared::RunFlushCallback(int32 result) {
+void PPB_VideoDecoder_Shared::RunFlushCallback(int32_t result) {
   flush_callback_->Run(result);
 }
 
-void PPB_VideoDecoder_Shared::RunResetCallback(int32 result) {
+void PPB_VideoDecoder_Shared::RunResetCallback(int32_t result) {
   reset_callback_->Run(result);
 }
 
 void PPB_VideoDecoder_Shared::RunBitstreamBufferCallback(
-    int32 bitstream_buffer_id,
-    int32 result) {
+    int32_t bitstream_buffer_id,
+    int32_t result) {
   CallbackById::iterator it =
       bitstream_buffer_callbacks_.find(bitstream_buffer_id);
   DCHECK(it != bitstream_buffer_callbacks_.end());
diff --git a/ppapi/shared_impl/ppb_video_decoder_shared.h b/ppapi/shared_impl/ppb_video_decoder_shared.h
index 23c8608..ad431a7 100644
--- a/ppapi/shared_impl/ppb_video_decoder_shared.h
+++ b/ppapi/shared_impl/ppb_video_decoder_shared.h
@@ -5,11 +5,13 @@
 #ifndef PPAPI_SHARED_IMPL_PPB_VIDEO_DECODER_SHARED_H_
 #define PPAPI_SHARED_IMPL_PPB_VIDEO_DECODER_SHARED_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ppapi/c/dev/ppb_video_decoder_dev.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/tracked_callback.h"
@@ -42,12 +44,12 @@ class PPAPI_SHARED_EXPORT PPB_VideoDecoder_Shared
  protected:
   bool SetFlushCallback(scoped_refptr<TrackedCallback> callback);
   bool SetResetCallback(scoped_refptr<TrackedCallback> callback);
-  bool SetBitstreamBufferCallback(int32 bitstream_buffer_id,
+  bool SetBitstreamBufferCallback(int32_t bitstream_buffer_id,
                                   scoped_refptr<TrackedCallback> callback);
 
-  void RunFlushCallback(int32 result);
-  void RunResetCallback(int32 result);
-  void RunBitstreamBufferCallback(int32 bitstream_buffer_id, int32 result);
+  void RunFlushCallback(int32_t result);
+  void RunResetCallback(int32_t result);
+  void RunBitstreamBufferCallback(int32_t bitstream_buffer_id, int32_t result);
 
   // Tell command buffer to process all commands it has received so far.
   void FlushCommandBuffer();
@@ -59,7 +61,7 @@ class PPAPI_SHARED_EXPORT PPB_VideoDecoder_Shared
  private:
   // Key: bitstream_buffer_id, value: callback to run when bitstream decode is
   // done.
-  typedef std::map<int32, scoped_refptr<TrackedCallback> > CallbackById;
+  typedef std::map<int32_t, scoped_refptr<TrackedCallback>> CallbackById;
 
   scoped_refptr<TrackedCallback> flush_callback_;
   scoped_refptr<TrackedCallback> reset_callback_;
diff --git a/ppapi/shared_impl/ppb_view_shared.h b/ppapi/shared_impl/ppb_view_shared.h
index a0e3794..0693451 100644
--- a/ppapi/shared_impl/ppb_view_shared.h
+++ b/ppapi/shared_impl/ppb_view_shared.h
@@ -6,6 +6,7 @@
 #define PPAPI_SHARED_IMPL_PPB_VIEW_SHARED_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ppapi/c/pp_rect.h"
 #include "ppapi/c/pp_size.h"
 #include "ppapi/shared_impl/resource.h"
diff --git a/ppapi/shared_impl/ppp_instance_combined.h b/ppapi/shared_impl/ppp_instance_combined.h
index a29b1bb..7fd61f9 100644
--- a/ppapi/shared_impl/ppp_instance_combined.h
+++ b/ppapi/shared_impl/ppp_instance_combined.h
@@ -5,8 +5,10 @@
 #ifndef PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_
 #define PPAPI_SHARED_IMPL_PPP_INSTANCE_COMBINED_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/callback.h"
+#include "base/macros.h"
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 
diff --git a/ppapi/shared_impl/private/net_address_private_impl.cc b/ppapi/shared_impl/private/net_address_private_impl.cc
index 7515592..07d61d7 100644
--- a/ppapi/shared_impl/private/net_address_private_impl.cc
+++ b/ppapi/shared_impl/private/net_address_private_impl.cc
@@ -4,21 +4,11 @@
 
 #include "ppapi/shared_impl/private/net_address_private_impl.h"
 
-#if defined(OS_WIN)
-#include <windows.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#elif defined(OS_POSIX) && !defined(OS_NACL)
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#endif
-
+#include <stddef.h>
 #include <string.h>
 
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
@@ -28,6 +18,16 @@
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/thunk.h"
 
+#if defined(OS_WIN)
+#include <windows.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#elif defined(OS_POSIX) && !defined(OS_NACL)
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#endif
+
 #if defined(OS_MACOSX)
 // This is a bit evil, but it's standard operating procedure for |s6_addr|....
 #define s6_addr16 __u6_addr.__u6_addr16
@@ -54,7 +54,7 @@ namespace {
 // Define our own net-host-net conversion, rather than reuse the one in
 // base/sys_byteorder.h, to simplify the NaCl port. NaCl has no byte swap
 // primitives.
-uint16 ConvertFromNetEndian16(uint16 x) {
+uint16_t ConvertFromNetEndian16(uint16_t x) {
 #if defined(ARCH_CPU_LITTLE_ENDIAN)
   return (x << 8) | (x >> 8);
 #else
@@ -62,7 +62,7 @@ uint16 ConvertFromNetEndian16(uint16 x) {
 #endif
 }
 
-uint16 ConvertToNetEndian16(uint16 x) {
+uint16_t ConvertToNetEndian16(uint16_t x) {
 #if defined(ARCH_CPU_LITTLE_ENDIAN)
   return (x << 8) | (x >> 8);
 #else
@@ -451,7 +451,7 @@ bool NetAddressPrivateImpl::SockaddrToNetAddress(
 // static
 bool NetAddressPrivateImpl::IPEndPointToNetAddress(
     const std::vector<unsigned char>& address,
-    uint16 port,
+    uint16_t port,
     PP_NetAddress_Private* addr) {
   if (!addr)
     return false;
@@ -484,7 +484,7 @@ bool NetAddressPrivateImpl::IPEndPointToNetAddress(
 bool NetAddressPrivateImpl::NetAddressToIPEndPoint(
     const PP_NetAddress_Private& addr,
     std::vector<unsigned char>* address,
-    uint16* port) {
+    uint16_t* port) {
   if (!address || !port)
     return false;
 
diff --git a/ppapi/shared_impl/private/net_address_private_impl.h b/ppapi/shared_impl/private/net_address_private_impl.h
index 814633b..a7867dd 100644
--- a/ppapi/shared_impl/private/net_address_private_impl.h
+++ b/ppapi/shared_impl/private/net_address_private_impl.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/ppb_net_address.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
@@ -27,12 +27,12 @@ class PPAPI_SHARED_EXPORT NetAddressPrivateImpl {
                                    PP_NetAddress_Private* net_addr);
 
   static bool IPEndPointToNetAddress(const std::vector<unsigned char>& address,
-                                     uint16 port,
+                                     uint16_t port,
                                      PP_NetAddress_Private* net_addr);
 
   static bool NetAddressToIPEndPoint(const PP_NetAddress_Private& net_addr,
                                      std::vector<unsigned char>* address,
-                                     uint16* port);
+                                     uint16_t* port);
 
   static std::string DescribeNetAddress(const PP_NetAddress_Private& addr,
                                         bool include_port);
diff --git a/ppapi/shared_impl/private/net_address_private_impl_constants.cc b/ppapi/shared_impl/private/net_address_private_impl_constants.cc
index 44cc4d3..46e7686 100644
--- a/ppapi/shared_impl/private/net_address_private_impl_constants.cc
+++ b/ppapi/shared_impl/private/net_address_private_impl_constants.cc
@@ -4,6 +4,7 @@
 
 #include "ppapi/shared_impl/private/net_address_private_impl.h"
 
+#include "build/build_config.h"
 #include "ppapi/c/private/ppb_net_address_private.h"
 
 namespace ppapi {
diff --git a/ppapi/shared_impl/private/ppb_char_set_shared.h b/ppapi/shared_impl/private/ppb_char_set_shared.h
index 96c3ba2..b277c20 100644
--- a/ppapi/shared_impl/private/ppb_char_set_shared.h
+++ b/ppapi/shared_impl/private/ppb_char_set_shared.h
@@ -5,7 +5,8 @@
 #ifndef PPAPI_SHARED_IMPL_PPB_CHAR_SET_SHARED_H_
 #define PPAPI_SHARED_IMPL_PPB_CHAR_SET_SHARED_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "ppapi/c/dev/ppb_char_set_dev.h"
 #include "ppapi/c/trusted/ppb_char_set_trusted.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
diff --git a/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h b/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h
index 1eaedbb..61a49d1 100644
--- a/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h
+++ b/ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h
@@ -5,8 +5,11 @@
 #ifndef PPAPI_SHARED_IMPL_PRIVATE_PPB_X509_CERTIFICATE_PRIVATE_IMPL_H_
 #define PPAPI_SHARED_IMPL_PRIVATE_PPB_X509_CERTIFICATE_PRIVATE_IMPL_H_
 
+#include <stdint.h>
+
 #include <vector>
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "ppapi/c/private/ppb_x509_certificate_private.h"
diff --git a/ppapi/shared_impl/proxy_lock.h b/ppapi/shared_impl/proxy_lock.h
index 274dcef..8c7bc83 100644
--- a/ppapi/shared_impl/proxy_lock.h
+++ b/ppapi/shared_impl/proxy_lock.h
@@ -7,9 +7,9 @@
 
 #include <utility>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
diff --git a/ppapi/shared_impl/proxy_lock_unittest.cc b/ppapi/shared_impl/proxy_lock_unittest.cc
index 425a00d..02a8d4b 100644
--- a/ppapi/shared_impl/proxy_lock_unittest.cc
+++ b/ppapi/shared_impl/proxy_lock_unittest.cc
@@ -8,6 +8,7 @@
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "ppapi/shared_impl/proxy_lock.h"
diff --git a/ppapi/shared_impl/resource.h b/ppapi/shared_impl/resource.h
index 025ea3b..f5a8b79 100644
--- a/ppapi/shared_impl/resource.h
+++ b/ppapi/shared_impl/resource.h
@@ -9,7 +9,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
diff --git a/ppapi/shared_impl/resource_tracker.cc b/ppapi/shared_impl/resource_tracker.cc
index 208212c..adadbe1 100644
--- a/ppapi/shared_impl/resource_tracker.cc
+++ b/ppapi/shared_impl/resource_tracker.cc
@@ -233,7 +233,7 @@ void ResourceTracker::LastPluginRefWasDeleted(Resource* object) {
   object->NotifyLastPluginRefWasDeleted();
 }
 
-int32 ResourceTracker::GetNextResourceValue() {
+int32_t ResourceTracker::GetNextResourceValue() {
 #if defined(NDEBUG)
   return ++last_resource_value_;
 #else
diff --git a/ppapi/shared_impl/resource_tracker.h b/ppapi/shared_impl/resource_tracker.h
index f22f948..2351405 100644
--- a/ppapi/shared_impl/resource_tracker.h
+++ b/ppapi/shared_impl/resource_tracker.h
@@ -5,10 +5,12 @@
 #ifndef PPAPI_SHARED_IMPL_RESOURCE_TRACKER_H_
 #define PPAPI_SHARED_IMPL_RESOURCE_TRACKER_H_
 
+#include <stdint.h>
+
 #include <set>
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -92,7 +94,7 @@ class PPAPI_SHARED_EXPORT ResourceTracker {
   // cancels pending callbacks for the resource.
   void LastPluginRefWasDeleted(Resource* object);
 
-  int32 GetNextResourceValue();
+  int32_t GetNextResourceValue();
 
   // In debug mode, checks whether |res| comes from the same resource tracker.
   bool CanOperateOnResource(PP_Resource res);
@@ -121,7 +123,7 @@ class PPAPI_SHARED_EXPORT ResourceTracker {
   typedef base::hash_map<PP_Resource, ResourceAndRefCount> ResourceMap;
   ResourceMap live_resources_;
 
-  int32 last_resource_value_;
+  int32_t last_resource_value_;
 
   // On the host side, we want to check that we are only called on the main
   // thread. This is to protect us from accidentally using the tracker from
diff --git a/ppapi/shared_impl/resource_var.h b/ppapi/shared_impl/resource_var.h
index 0696d57..fe48120 100644
--- a/ppapi/shared_impl/resource_var.h
+++ b/ppapi/shared_impl/resource_var.h
@@ -5,6 +5,7 @@
 #ifndef PPAPI_SHARED_IMPL_RESOURCE_VAR_H_
 #define PPAPI_SHARED_IMPL_RESOURCE_VAR_H_
 
+#include "base/macros.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
diff --git a/ppapi/shared_impl/scoped_pp_var.cc b/ppapi/shared_impl/scoped_pp_var.cc
index a6d1aa3..caa0c51 100644
--- a/ppapi/shared_impl/scoped_pp_var.cc
+++ b/ppapi/shared_impl/scoped_pp_var.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/shared_impl/scoped_pp_var.h"
 
+#include <stdint.h>
+
 #include "ppapi/c/dev/ppb_memory_dev.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/var_tracker.h"
diff --git a/ppapi/shared_impl/scoped_pp_var.h b/ppapi/shared_impl/scoped_pp_var.h
index e55674c..a88e417 100644
--- a/ppapi/shared_impl/scoped_pp_var.h
+++ b/ppapi/shared_impl/scoped_pp_var.h
@@ -5,6 +5,7 @@
 #ifndef PPAPI_SHARED_IMPL_SCOPED_PP_VAR_H_
 #define PPAPI_SHARED_IMPL_SCOPED_PP_VAR_H_
 
+#include <stddef.h>
 #include <stdlib.h>
 
 #include "base/macros.h"
diff --git a/ppapi/shared_impl/test_globals.h b/ppapi/shared_impl/test_globals.h
index fba9a57..e961767 100644
--- a/ppapi/shared_impl/test_globals.h
+++ b/ppapi/shared_impl/test_globals.h
@@ -5,7 +5,10 @@
 #ifndef PPAPI_SHARED_IMPL_TEST_GLOBALS_H_
 #define PPAPI_SHARED_IMPL_TEST_GLOBALS_H_
 
+#include <stdint.h>
+
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "ppapi/shared_impl/callback_tracker.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
@@ -28,24 +31,24 @@ class TestVarTracker : public VarTracker {
   ResourceVar* MakeResourceVar(PP_Resource pp_resource) override {
     return NULL;
   }
-  ArrayBufferVar* CreateArrayBuffer(uint32 size_in_bytes) override {
+  ArrayBufferVar* CreateArrayBuffer(uint32_t size_in_bytes) override {
     return NULL;
   }
   ArrayBufferVar* CreateShmArrayBuffer(
-      uint32 size_in_bytes,
+      uint32_t size_in_bytes,
       base::SharedMemoryHandle handle) override {
     return NULL;
   }
   void DidDeleteInstance(PP_Instance instance) override {}
   int TrackSharedMemoryHandle(PP_Instance instance,
                               base::SharedMemoryHandle handle,
-                              uint32 size_in_bytes) override {
+                              uint32_t size_in_bytes) override {
     return -1;
   }
   bool StopTrackingSharedMemoryHandle(int id,
                                       PP_Instance instance,
                                       base::SharedMemoryHandle* handle,
-                                      uint32* size_in_bytes) override {
+                                      uint32_t* size_in_bytes) override {
     return false;
   }
 };
diff --git a/ppapi/shared_impl/test_utils.cc b/ppapi/shared_impl/test_utils.cc
index 6f85fce..2ab8c5a 100644
--- a/ppapi/shared_impl/test_utils.cc
+++ b/ppapi/shared_impl/test_utils.cc
@@ -4,6 +4,9 @@
 
 #include "ppapi/shared_impl/test_utils.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <cmath>
 
 #include "base/containers/hash_tables.h"
diff --git a/ppapi/shared_impl/thread_aware_callback.h b/ppapi/shared_impl/thread_aware_callback.h
index 92284678..e65acca 100644
--- a/ppapi/shared_impl/thread_aware_callback.h
+++ b/ppapi/shared_impl/thread_aware_callback.h
@@ -5,8 +5,8 @@
 #ifndef PPAPI_SHARED_IMPL_THREAD_AWARE_CALLBACK_H_
 #define PPAPI_SHARED_IMPL_THREAD_AWARE_CALLBACK_H_
 
-#include "base/basictypes.h"
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
 #include "ppapi/shared_impl/proxy_lock.h"
diff --git a/ppapi/shared_impl/tracked_callback.h b/ppapi/shared_impl/tracked_callback.h
index 8bf7a4b..b80e680 100644
--- a/ppapi/shared_impl/tracked_callback.h
+++ b/ppapi/shared_impl/tracked_callback.h
@@ -5,11 +5,13 @@
 #ifndef PPAPI_SHARED_IMPL_TRACKED_CALLBACK_H_
 #define PPAPI_SHARED_IMPL_TRACKED_CALLBACK_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <set>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/condition_variable.h"
diff --git a/ppapi/shared_impl/var.cc b/ppapi/shared_impl/var.cc
index 98c762a..941109f 100644
--- a/ppapi/shared_impl/var.cc
+++ b/ppapi/shared_impl/var.cc
@@ -4,6 +4,8 @@
 
 #include "ppapi/shared_impl/var.h"
 
+#include <stddef.h>
+
 #include <limits>
 
 #include "base/logging.h"
@@ -90,7 +92,7 @@ DictionaryVar* Var::AsDictionaryVar() { return NULL; }
 ResourceVar* Var::AsResourceVar() { return NULL; }
 
 PP_Var Var::GetPPVar() {
-  int32 id = GetOrCreateVarID();
+  int32_t id = GetOrCreateVarID();
   if (!id)
     return PP_MakeNull();
 
@@ -101,13 +103,15 @@ PP_Var Var::GetPPVar() {
   return result;
 }
 
-int32 Var::GetExistingVarID() const { return var_id_; }
+int32_t Var::GetExistingVarID() const {
+  return var_id_;
+}
 
 Var::Var() : var_id_(0) {}
 
 Var::~Var() {}
 
-int32 Var::GetOrCreateVarID() {
+int32_t Var::GetOrCreateVarID() {
   VarTracker* tracker = PpapiGlobals::Get()->GetVarTracker();
   if (var_id_) {
     if (!tracker->AddRefVar(var_id_))
@@ -120,7 +124,7 @@ int32 Var::GetOrCreateVarID() {
   return var_id_;
 }
 
-void Var::AssignVarID(int32 id) {
+void Var::AssignVarID(int32_t id) {
   DCHECK(!var_id_);  // Must not have already been generated.
   var_id_ = id;
 }
@@ -131,7 +135,7 @@ StringVar::StringVar() {}
 
 StringVar::StringVar(const std::string& str) : value_(str) {}
 
-StringVar::StringVar(const char* str, uint32 len) : value_(str, len) {}
+StringVar::StringVar(const char* str, uint32_t len) : value_(str, len) {}
 
 StringVar::~StringVar() {}
 
@@ -141,11 +145,11 @@ PP_VarType StringVar::GetType() const { return PP_VARTYPE_STRING; }
 
 // static
 PP_Var StringVar::StringToPPVar(const std::string& var) {
-  return StringToPPVar(var.c_str(), static_cast<uint32>(var.size()));
+  return StringToPPVar(var.c_str(), static_cast<uint32_t>(var.size()));
 }
 
 // static
-PP_Var StringVar::StringToPPVar(const char* data, uint32 len) {
+PP_Var StringVar::StringToPPVar(const char* data, uint32_t len) {
   scoped_refptr<StringVar> str(new StringVar(data, len));
   if (!str.get() || !base::IsStringUTF8(str->value()))
     return PP_MakeNull();
diff --git a/ppapi/shared_impl/var.h b/ppapi/shared_impl/var.h
index 5e46864..3c3e150 100644
--- a/ppapi/shared_impl/var.h
+++ b/ppapi/shared_impl/var.h
@@ -5,9 +5,12 @@
 #ifndef PPAPI_SHARED_IMPL_VAR_H_
 #define PPAPI_SHARED_IMPL_VAR_H_
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory.h"
 #include "ppapi/c/pp_var.h"
@@ -54,7 +57,7 @@ class PPAPI_SHARED_EXPORT Var : public base::RefCounted<Var> {
   //
   // Contrast to GetOrCreateVarID which creates the ID and a ref on behalf of
   // the plugin.
-  int32 GetExistingVarID() const;
+  int32_t GetExistingVarID() const;
 
  protected:
   friend class base::RefCounted<Var>;
@@ -69,18 +72,18 @@ class PPAPI_SHARED_EXPORT Var : public base::RefCounted<Var> {
   //
   // This function will take a reference to the var that will be passed to the
   // caller.
-  int32 GetOrCreateVarID();
+  int32_t GetOrCreateVarID();
 
   // Sets the internal object ID. This assumes that the ID hasn't been set
   // before. This is used in cases where the ID is generated externally.
-  void AssignVarID(int32 id);
+  void AssignVarID(int32_t id);
 
   // Reset the assigned object ID.
   void ResetVarID() { var_id_ = 0; }
 
  private:
   // This will be 0 if no ID has been assigned (this happens lazily).
-  int32 var_id_;
+  int32_t var_id_;
 
   DISALLOW_COPY_AND_ASSIGN(Var);
 };
@@ -100,7 +103,7 @@ class PPAPI_SHARED_EXPORT Var : public base::RefCounted<Var> {
 class PPAPI_SHARED_EXPORT StringVar : public Var {
  public:
   explicit StringVar(const std::string& str);
-  StringVar(const char* str, uint32 len);
+  StringVar(const char* str, uint32_t len);
   ~StringVar() override;
 
   const std::string& value() const { return value_; }
@@ -122,7 +125,7 @@ class PPAPI_SHARED_EXPORT StringVar : public Var {
   // The return value will have a reference count of 1. Internally, this will
   // create a StringVar and return the reference to it in the var.
   static PP_Var StringToPPVar(const std::string& str);
-  static PP_Var StringToPPVar(const char* str, uint32 len);
+  static PP_Var StringToPPVar(const char* str, uint32_t len);
 
   // Same as StringToPPVar but avoids a copy by destructively swapping the
   // given string into the newly created StringVar. The string must already be
@@ -162,7 +165,7 @@ class PPAPI_SHARED_EXPORT ArrayBufferVar : public Var {
 
   virtual void* Map() = 0;
   virtual void Unmap() = 0;
-  virtual uint32 ByteLength() = 0;
+  virtual uint32_t ByteLength() = 0;
 
   // Creates a new shared memory region, and copies the data in the
   // ArrayBufferVar into it. On the plugin side, host_shm_handle_id will be set
diff --git a/ppapi/shared_impl/var_tracker.cc b/ppapi/shared_impl/var_tracker.cc
index 7fabb80..eddceee 100644
--- a/ppapi/shared_impl/var_tracker.cc
+++ b/ppapi/shared_impl/var_tracker.cc
@@ -38,13 +38,13 @@ void VarTracker::CheckThreadingPreconditions() const {
 #endif
 }
 
-int32 VarTracker::AddVar(Var* var) {
+int32_t VarTracker::AddVar(Var* var) {
   CheckThreadingPreconditions();
 
   return AddVarInternal(var, ADD_VAR_TAKE_ONE_REFERENCE);
 }
 
-Var* VarTracker::GetVar(int32 var_id) const {
+Var* VarTracker::GetVar(int32_t var_id) const {
   CheckThreadingPreconditions();
 
   VarMap::const_iterator result = live_vars_.find(var_id);
@@ -58,10 +58,10 @@ Var* VarTracker::GetVar(const PP_Var& var) const {
 
   if (!IsVarTypeRefcounted(var.type))
     return NULL;
-  return GetVar(static_cast<int32>(var.value.as_id));
+  return GetVar(static_cast<int32_t>(var.value.as_id));
 }
 
-bool VarTracker::AddRefVar(int32 var_id) {
+bool VarTracker::AddRefVar(int32_t var_id) {
   CheckThreadingPreconditions();
 
   DLOG_IF(ERROR, !CheckIdType(var_id, PP_ID_TYPE_VAR))
@@ -91,10 +91,10 @@ bool VarTracker::AddRefVar(const PP_Var& var) {
 
   if (!IsVarTypeRefcounted(var.type))
     return true;
-  return AddRefVar(static_cast<int32>(var.value.as_id));
+  return AddRefVar(static_cast<int32_t>(var.value.as_id));
 }
 
-bool VarTracker::ReleaseVar(int32 var_id) {
+bool VarTracker::ReleaseVar(int32_t var_id) {
   CheckThreadingPreconditions();
 
   DLOG_IF(ERROR, !CheckIdType(var_id, PP_ID_TYPE_VAR))
@@ -134,15 +134,15 @@ bool VarTracker::ReleaseVar(const PP_Var& var) {
 
   if (!IsVarTypeRefcounted(var.type))
     return false;
-  return ReleaseVar(static_cast<int32>(var.value.as_id));
+  return ReleaseVar(static_cast<int32_t>(var.value.as_id));
 }
 
-int32 VarTracker::AddVarInternal(Var* var, AddVarRefMode mode) {
+int32_t VarTracker::AddVarInternal(Var* var, AddVarRefMode mode) {
   // If the plugin manages to create millions of strings.
-  if (last_var_id_ == std::numeric_limits<int32>::max() >> kPPIdTypeBits)
+  if (last_var_id_ == std::numeric_limits<int32_t>::max() >> kPPIdTypeBits)
     return 0;
 
-  int32 new_id = MakeTypedId(++last_var_id_, PP_ID_TYPE_VAR);
+  int32_t new_id = MakeTypedId(++last_var_id_, PP_ID_TYPE_VAR);
   std::pair<VarMap::iterator, bool> was_inserted =
       live_vars_.insert(std::make_pair(
           new_id, VarInfo(var, mode == ADD_VAR_TAKE_ONE_REFERENCE ? 1 : 0)));
@@ -152,7 +152,7 @@ int32 VarTracker::AddVarInternal(Var* var, AddVarRefMode mode) {
   return new_id;
 }
 
-VarTracker::VarMap::iterator VarTracker::GetLiveVar(int32 id) {
+VarTracker::VarMap::iterator VarTracker::GetLiveVar(int32_t id) {
   return live_vars_.find(id);
 }
 
@@ -181,15 +181,15 @@ bool VarTracker::IsVarTypeRefcounted(PP_VarType type) {
 }
 
 VarTracker::VarMap::iterator VarTracker::GetLiveVar(const PP_Var& var) {
-  return live_vars_.find(static_cast<int32>(var.value.as_id));
+  return live_vars_.find(static_cast<int32_t>(var.value.as_id));
 }
 
 VarTracker::VarMap::const_iterator VarTracker::GetLiveVar(const PP_Var& var)
     const {
-  return live_vars_.find(static_cast<int32>(var.value.as_id));
+  return live_vars_.find(static_cast<int32_t>(var.value.as_id));
 }
 
-PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes) {
+PP_Var VarTracker::MakeArrayBufferPPVar(uint32_t size_in_bytes) {
   CheckThreadingPreconditions();
 
   scoped_refptr<ArrayBufferVar> array_buffer(CreateArrayBuffer(size_in_bytes));
@@ -198,7 +198,7 @@ PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes) {
   return array_buffer->GetPPVar();
 }
 
-PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes,
+PP_Var VarTracker::MakeArrayBufferPPVar(uint32_t size_in_bytes,
                                         const void* data) {
   CheckThreadingPreconditions();
 
@@ -206,7 +206,7 @@ PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes,
   return array_buffer ? array_buffer->GetPPVar() : PP_MakeNull();
 }
 
-ArrayBufferVar* VarTracker::MakeArrayBufferVar(uint32 size_in_bytes,
+ArrayBufferVar* VarTracker::MakeArrayBufferVar(uint32_t size_in_bytes,
                                                const void* data) {
   CheckThreadingPreconditions();
 
@@ -217,7 +217,7 @@ ArrayBufferVar* VarTracker::MakeArrayBufferVar(uint32 size_in_bytes,
   return array_buffer;
 }
 
-PP_Var VarTracker::MakeArrayBufferPPVar(uint32 size_in_bytes,
+PP_Var VarTracker::MakeArrayBufferPPVar(uint32_t size_in_bytes,
                                         base::SharedMemoryHandle handle) {
   CheckThreadingPreconditions();
 
diff --git a/ppapi/shared_impl/var_tracker.h b/ppapi/shared_impl/var_tracker.h
index 814b58c..6ef9fc8 100644
--- a/ppapi/shared_impl/var_tracker.h
+++ b/ppapi/shared_impl/var_tracker.h
@@ -5,10 +5,12 @@
 #ifndef PPAPI_SHARED_IMPL_VAR_TRACKER_H_
 #define PPAPI_SHARED_IMPL_VAR_TRACKER_H_
 
+#include <stdint.h>
+
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
@@ -52,41 +54,42 @@ class PPAPI_SHARED_EXPORT VarTracker {
   virtual ~VarTracker();
 
   // Called by the Var object to add a new var to the tracker.
-  int32 AddVar(Var* var);
+  int32_t AddVar(Var* var);
 
   // Looks up a given var and returns a reference to the Var if it exists.
   // Returns NULL if the var type is not an object we track (POD) or is
   // invalid.
-  Var* GetVar(int32 var_id) const;
+  Var* GetVar(int32_t var_id) const;
   Var* GetVar(const PP_Var& var) const;
 
   // Increases a previously-known Var ID's refcount, returning true on success,
   // false if the ID is invalid. The PP_Var version returns true and does
   // nothing for non-refcounted type vars.
-  bool AddRefVar(int32 var_id);
+  bool AddRefVar(int32_t var_id);
   bool AddRefVar(const PP_Var& var);
 
   // Decreases the given Var ID's refcount, returning true on success, false if
   // the ID is invalid or if the refcount was already 0. The PP_Var version
   // returns true and does nothing for non-refcounted type vars. The var will
   // be deleted if there are no more refs to it.
-  bool ReleaseVar(int32 var_id);
+  bool ReleaseVar(int32_t var_id);
   bool ReleaseVar(const PP_Var& var);
 
   // Create a new array buffer of size |size_in_bytes|. Return a PP_Var that
   // that references it and has an initial reference-count of 1.
-  PP_Var MakeArrayBufferPPVar(uint32 size_in_bytes);
+  PP_Var MakeArrayBufferPPVar(uint32_t size_in_bytes);
   // Same as above, but copy the contents of |data| in to the new array buffer.
-  PP_Var MakeArrayBufferPPVar(uint32 size_in_bytes, const void* data);
+  PP_Var MakeArrayBufferPPVar(uint32_t size_in_bytes, const void* data);
   // Same as above, but copy the contents of the shared memory in |h|
   // into the new array buffer.
-  PP_Var MakeArrayBufferPPVar(uint32 size_in_bytes, base::SharedMemoryHandle h);
+  PP_Var MakeArrayBufferPPVar(uint32_t size_in_bytes,
+                              base::SharedMemoryHandle h);
 
   // Create an ArrayBuffer and copy the contents of |data| in to it. The
   // returned object has 0 reference count in the tracker, and like all
   // RefCounted objects, has a 0 initial internal reference count. (You should
   // usually immediately put this in a scoped_refptr).
-  ArrayBufferVar* MakeArrayBufferVar(uint32 size_in_bytes, const void* data);
+  ArrayBufferVar* MakeArrayBufferVar(uint32_t size_in_bytes, const void* data);
 
   // Creates a new resource var from a resource creation message. Returns a
   // PP_Var that references a new PP_Resource, both with an initial reference
@@ -137,7 +140,7 @@ class PPAPI_SHARED_EXPORT VarTracker {
   // host. Not implemented on the plugin side.
   virtual int TrackSharedMemoryHandle(PP_Instance instance,
                                       base::SharedMemoryHandle handle,
-                                      uint32 size_in_bytes) = 0;
+                                      uint32_t size_in_bytes) = 0;
 
   // Resolves an "id" generated by TrackSharedMemoryHandle back into
   // a SharedMemory handle and its size on the host.
@@ -145,7 +148,7 @@ class PPAPI_SHARED_EXPORT VarTracker {
   virtual bool StopTrackingSharedMemoryHandle(int id,
                                               PP_Instance instance,
                                               base::SharedMemoryHandle* handle,
-                                              uint32* size_in_bytes) = 0;
+                                              uint32_t* size_in_bytes) = 0;
 
  protected:
   struct PPAPI_SHARED_EXPORT VarInfo {
@@ -170,7 +173,7 @@ class PPAPI_SHARED_EXPORT VarTracker {
     // we know when we can stop tracking this object.
     int track_with_no_reference_count;
   };
-  typedef base::hash_map<int32, VarInfo> VarMap;
+  typedef base::hash_map<int32_t, VarInfo> VarMap;
 
   // Specifies what should happen with the refcount when calling AddVarInternal.
   enum AddVarRefMode {
@@ -186,10 +189,10 @@ class PPAPI_SHARED_EXPORT VarTracker {
   // initial refcount of the added object will be 0 or 1.
   //
   // Overridden in the plugin proxy to do additional object tracking.
-  virtual int32 AddVarInternal(Var* var, AddVarRefMode mode);
+  virtual int32_t AddVarInternal(Var* var, AddVarRefMode mode);
 
   // Convenience functions for doing lookups into the live_vars_ map.
-  VarMap::iterator GetLiveVar(int32 id);
+  VarMap::iterator GetLiveVar(int32_t id);
   VarMap::iterator GetLiveVar(const PP_Var& var);
   VarMap::const_iterator GetLiveVar(const PP_Var& var) const;
 
@@ -217,15 +220,15 @@ class PPAPI_SHARED_EXPORT VarTracker {
   VarMap live_vars_;
 
   // Last assigned var ID.
-  int32 last_var_id_;
+  int32_t last_var_id_;
 
  private:
   // Create and return a new ArrayBufferVar size_in_bytes bytes long. This is
   // implemented by the Host and Plugin tracker separately, so that it can be
   // a real WebKit ArrayBuffer on the host side.
-  virtual ArrayBufferVar* CreateArrayBuffer(uint32 size_in_bytes) = 0;
+  virtual ArrayBufferVar* CreateArrayBuffer(uint32_t size_in_bytes) = 0;
   virtual ArrayBufferVar* CreateShmArrayBuffer(
-      uint32 size_in_bytes,
+      uint32_t size_in_bytes,
       base::SharedMemoryHandle handle) = 0;
 
   // On the host side, we want to check that we are only called on the main