Switch to standard integer types in base/memory/.

base/memory/discardable_shared_memory_unittest.cc

Index: base/memory/discardable_shared_memory_unittest.cc
diff --git a/base/memory/discardable_shared_memory_unittest.cc b/base/memory/discardable_shared_memory_unittest.cc
index aaa6c0ddd28e7fc0b090e5557bf62e067a6720d2..3348ed1a884bf5437ebc9ad502578ec148bfd09e 100644
--- a/base/memory/discardable_shared_memory_unittest.cc
+++ b/base/memory/discardable_shared_memory_unittest.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
 #include "base/memory/discardable_shared_memory.h"
 #include "base/process/process_metrics.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -27,7 +28,7 @@ class TestDiscardableSharedMemory : public DiscardableSharedMemory {
 };
 
 TEST(DiscardableSharedMemoryTest, CreateAndMap) {
-  const uint32 kDataSize = 1024;
+  const uint32_t kDataSize = 1024;
 
   TestDiscardableSharedMemory memory;
   bool rv = memory.CreateAndMap(kDataSize);
@@ -37,7 +38,7 @@ TEST(DiscardableSharedMemoryTest, CreateAndMap) {
 }
 
 TEST(DiscardableSharedMemoryTest, CreateFromHandle) {
-  const uint32 kDataSize = 1024;
+  const uint32_t kDataSize = 1024;
 
   TestDiscardableSharedMemory memory1;
   bool rv = memory1.CreateAndMap(kDataSize);
@@ -55,7 +56,7 @@ TEST(DiscardableSharedMemoryTest, CreateFromHandle) {
 }
 
 TEST(DiscardableSharedMemoryTest, LockAndUnlock) {
-  const uint32 kDataSize = 1024;
+  const uint32_t kDataSize = 1024;
 
   TestDiscardableSharedMemory memory1;
   bool rv = memory1.CreateAndMap(kDataSize);
@@ -109,7 +110,7 @@ TEST(DiscardableSharedMemoryTest, LockAndUnlock) {
 }
 
 TEST(DiscardableSharedMemoryTest, Purge) {
-  const uint32 kDataSize = 1024;
+  const uint32_t kDataSize = 1024;
 
   TestDiscardableSharedMemory memory1;
   bool rv = memory1.CreateAndMap(kDataSize);
@@ -151,7 +152,7 @@ TEST(DiscardableSharedMemoryTest, Purge) {
 }
 
 TEST(DiscardableSharedMemoryTest, LastUsed) {
-  const uint32 kDataSize = 1024;
+  const uint32_t kDataSize = 1024;
 
   TestDiscardableSharedMemory memory1;
   bool rv = memory1.CreateAndMap(kDataSize);
@@ -219,7 +220,7 @@ TEST(DiscardableSharedMemoryTest, LastUsed) {
 }
 
 TEST(DiscardableSharedMemoryTest, LockShouldAlwaysFailAfterSuccessfulPurge) {
-  const uint32 kDataSize = 1024;
+  const uint32_t kDataSize = 1024;
 
   TestDiscardableSharedMemory memory1;
   bool rv = memory1.CreateAndMap(kDataSize);
@@ -246,9 +247,9 @@ TEST(DiscardableSharedMemoryTest, LockShouldAlwaysFailAfterSuccessfulPurge) {
 }
 
 TEST(DiscardableSharedMemoryTest, LockAndUnlockRange) {
-  const uint32 kDataSize = 32;
+  const uint32_t kDataSize = 32;
 
-  uint32 data_size_in_bytes = kDataSize * base::GetPageSize();
+  uint32_t data_size_in_bytes = kDataSize * base::GetPageSize();
 
   TestDiscardableSharedMemory memory1;
   bool rv = memory1.CreateAndMap(data_size_in_bytes);
@@ -307,7 +308,7 @@ TEST(DiscardableSharedMemoryTest, LockAndUnlockRange) {
 }
 
 TEST(DiscardableSharedMemoryTest, MappedSize) {
-  const uint32 kDataSize = 1024;
+  const uint32_t kDataSize = 1024;
 
   TestDiscardableSharedMemory memory;
   bool rv = memory.CreateAndMap(kDataSize);
@@ -322,7 +323,7 @@ TEST(DiscardableSharedMemoryTest, MappedSize) {
 }
 
 TEST(DiscardableSharedMemoryTest, Close) {
-  const uint32 kDataSize = 1024;
+  const uint32_t kDataSize = 1024;
 
   TestDiscardableSharedMemory memory;
   bool rv = memory.CreateAndMap(kDataSize);
@@ -348,7 +349,7 @@ TEST(DiscardableSharedMemoryTest, Close) {
 // defined and MADV_REMOVE is supported.
 #if defined(DISCARDABLE_SHARED_MEMORY_ZERO_FILL_ON_DEMAND_PAGES_AFTER_PURGE)
 TEST(DiscardableSharedMemoryTest, ZeroFilledPagesAfterPurge) {
-  const uint32 kDataSize = 1024;
+  const uint32_t kDataSize = 1024;
 
   TestDiscardableSharedMemory memory1;
   bool rv = memory1.CreateAndMap(kDataSize);
@@ -379,7 +380,7 @@ TEST(DiscardableSharedMemoryTest, ZeroFilledPagesAfterPurge) {
 
   // Check that reading memory after it has been purged is returning
   // zero-filled pages.
-  uint8 expected_data[kDataSize] = {};
+  uint8_t expected_data[kDataSize] = {};
   EXPECT_EQ(memcmp(memory2.memory(), expected_data, kDataSize), 0);
 }
 #endif