Switch to standard integer types in base/test/.

BUG=138542
TBR=phajdan.jr@chromium.org

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

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

48 files changed, 105 insertions, 40 deletions

diff --git a/base/test/gtest_util.cc b/base/test/gtest_util.cc
index 3f44d74..b9ab4a3 100644
--- a/base/test/gtest_util.cc
+++ b/base/test/gtest_util.cc
@@ -4,6 +4,8 @@
 
 #include "base/test/gtest_util.h"
 
+#include <stddef.h>
+
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/values.h"
diff --git a/base/test/gtest_xml_util.cc b/base/test/gtest_xml_util.cc
index e24d522..5426a24 100644
--- a/base/test/gtest_xml_util.cc
+++ b/base/test/gtest_xml_util.cc
@@ -4,6 +4,8 @@
 
 #include "base/test/gtest_xml_util.h"
 
+#include <stdint.h>
+
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
@@ -118,8 +120,8 @@ bool ProcessGTestOutput(const base::FilePath& output_file,
           if (!xml_reader.NodeAttribute("time", &test_time_str))
             return false;
           result.elapsed_time = TimeDelta::FromMicroseconds(
-              static_cast<int64>(strtod(test_time_str.c_str(), NULL) *
-                  Time::kMicrosecondsPerSecond));
+              static_cast<int64_t>(strtod(test_time_str.c_str(), NULL) *
+                                   Time::kMicrosecondsPerSecond));
 
           result.status = TestResult::TEST_SUCCESS;
 
diff --git a/base/test/histogram_tester.cc b/base/test/histogram_tester.cc
index 8ba0984..5fb01fb 100644
--- a/base/test/histogram_tester.cc
+++ b/base/test/histogram_tester.cc
@@ -4,6 +4,8 @@
 
 #include "base/test/histogram_tester.h"
 
+#include <stddef.h>
+
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/metrics_hashes.h"
diff --git a/base/test/histogram_tester.h b/base/test/histogram_tester.h
index cfab3c6..604ba83 100644
--- a/base/test/histogram_tester.h
+++ b/base/test/histogram_tester.h
@@ -11,7 +11,7 @@
 #include <utility>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/histogram_base.h"
diff --git a/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc
index dd13c4a..6a0c4bdb 100644
--- a/base/test/launcher/test_launcher.cc
+++ b/base/test/launcher/test_launcher.cc
@@ -4,10 +4,6 @@
 
 #include "base/test/launcher/test_launcher.h"
 
-#if defined(OS_POSIX)
-#include <fcntl.h>
-#endif
-
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -20,6 +16,7 @@
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/kill.h"
@@ -40,8 +37,13 @@
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_POSIX)
+#include <fcntl.h>
+#endif
+
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
@@ -167,7 +169,7 @@ class SignalFDWatcher : public MessageLoopForIO::Watcher {
 // Parses the environment variable var as an Int32.  If it is unset, returns
 // true.  If it is set, unsets it then converts it to Int32 before
 // returning it in |result|.  Returns true on success.
-bool TakeInt32FromEnvironment(const char* const var, int32* result) {
+bool TakeInt32FromEnvironment(const char* const var, int32_t* result) {
   scoped_ptr<Environment> env(Environment::Create());
   std::string str_val;
 
@@ -951,7 +953,7 @@ void TestLauncher::RunTests() {
     if (excluded)
       continue;
 
-    if (Hash(test_name) % total_shards_ != static_cast<uint32>(shard_index_))
+    if (Hash(test_name) % total_shards_ != static_cast<uint32_t>(shard_index_))
       continue;
 
     test_names.push_back(test_name);
diff --git a/base/test/launcher/test_launcher.h b/base/test/launcher/test_launcher.h
index 571a318..6826e42 100644
--- a/base/test/launcher/test_launcher.h
+++ b/base/test/launcher/test_launcher.h
@@ -5,12 +5,15 @@
 #ifndef BASE_TEST_LAUNCHER_TEST_LAUNCHER_H_
 #define BASE_TEST_LAUNCHER_TEST_LAUNCHER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <set>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/test/gtest_util.h"
 #include "base/test/launcher/test_result.h"
 #include "base/test/launcher/test_results_tracker.h"
@@ -151,8 +154,8 @@ class TestLauncher {
   TestLauncherDelegate* launcher_delegate_;
 
   // Support for outer sharding, just like gtest does.
-  int32 total_shards_;  // Total number of outer shards, at least one.
-  int32 shard_index_;   // Index of shard the launcher is to run.
+  int32_t total_shards_;  // Total number of outer shards, at least one.
+  int32_t shard_index_;   // Index of shard the launcher is to run.
 
   int cycles_;  // Number of remaining test itreations, or -1 for infinite.
 
diff --git a/base/test/launcher/test_launcher_ios.cc b/base/test/launcher/test_launcher_ios.cc
index a7243f7..9be26fe 100644
--- a/base/test/launcher/test_launcher_ios.cc
+++ b/base/test/launcher/test_launcher_ios.cc
@@ -12,6 +12,7 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
diff --git a/base/test/launcher/test_result.cc b/base/test/launcher/test_result.cc
index 70d7a80..e732025 100644
--- a/base/test/launcher/test_result.cc
+++ b/base/test/launcher/test_result.cc
@@ -4,6 +4,8 @@
 
 #include "base/test/launcher/test_result.h"
 
+#include <stddef.h>
+
 #include "base/logging.h"
 
 namespace base {
diff --git a/base/test/launcher/test_results_tracker.cc b/base/test/launcher/test_results_tracker.cc
index 8516a48..e950d17 100644
--- a/base/test/launcher/test_results_tracker.cc
+++ b/base/test/launcher/test_results_tracker.cc
@@ -4,6 +4,8 @@
 
 #include "base/test/launcher/test_results_tracker.h"
 
+#include <stddef.h>
+
 #include <utility>
 
 #include "base/base64.h"
diff --git a/base/test/launcher/test_results_tracker.h b/base/test/launcher/test_results_tracker.h
index 53a4e56..163d75e 100644
--- a/base/test/launcher/test_results_tracker.h
+++ b/base/test/launcher/test_results_tracker.h
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/test/launcher/test_result.h"
 #include "base/threading/thread_checker.h"
 
diff --git a/base/test/launcher/unit_test_launcher.cc b/base/test/launcher/unit_test_launcher.cc
index 897f036..003f5ca 100644
--- a/base/test/launcher/unit_test_launcher.cc
+++ b/base/test/launcher/unit_test_launcher.cc
@@ -14,6 +14,7 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
@@ -27,6 +28,7 @@
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_checker.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
diff --git a/base/test/launcher/unit_test_launcher.h b/base/test/launcher/unit_test_launcher.h
index 83e5eaf..2e6b813 100644
--- a/base/test/launcher/unit_test_launcher.h
+++ b/base/test/launcher/unit_test_launcher.h
@@ -5,9 +5,13 @@
 #ifndef BASE_TEST_LAUNCHER_UNIT_TEST_LAUNCHER_H_
 #define BASE_TEST_LAUNCHER_UNIT_TEST_LAUNCHER_H_
 
+#include <stddef.h>
+
 #include "base/callback.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
 #include "base/test/launcher/test_launcher.h"
+#include "build/build_config.h"
 
 namespace base {
 
diff --git a/base/test/malloc_wrapper.h b/base/test/malloc_wrapper.h
index 0fa7dbb..d06228d 100644
--- a/base/test/malloc_wrapper.h
+++ b/base/test/malloc_wrapper.h
@@ -5,7 +5,7 @@
 #ifndef BASE_TEST_MALLOC_WRAPPER_H_
 #define BASE_TEST_MALLOC_WRAPPER_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
 
 // BASE_EXPORT depends on COMPONENT_BUILD.
 // This will always be a separate shared library, so don't use BASE_EXPORT here.
diff --git a/base/test/mock_devices_changed_observer.h b/base/test/mock_devices_changed_observer.h
index 3255002..bc8bb4e 100644
--- a/base/test/mock_devices_changed_observer.h
+++ b/base/test/mock_devices_changed_observer.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/macros.h"
 #include "base/system_monitor/system_monitor.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
diff --git a/base/test/mock_entropy_provider.cc b/base/test/mock_entropy_provider.cc
index 75186a5..a4cc972 100644
--- a/base/test/mock_entropy_provider.cc
+++ b/base/test/mock_entropy_provider.cc
@@ -9,7 +9,8 @@ namespace base {
 MockEntropyProvider::~MockEntropyProvider() {}
 
 double MockEntropyProvider::GetEntropyForTrial(
-    const std::string& trial_name, uint32 randomization_seed) const {
+    const std::string& trial_name,
+    uint32_t randomization_seed) const {
   return 0.5;
 }
 
diff --git a/base/test/mock_entropy_provider.h b/base/test/mock_entropy_provider.h
index c55bea6..32e9332 100644
--- a/base/test/mock_entropy_provider.h
+++ b/base/test/mock_entropy_provider.h
@@ -5,6 +5,8 @@
 #ifndef BASE_TEST_MOCK_ENTROPY_PROVIDER_H_
 #define BASE_TEST_MOCK_ENTROPY_PROVIDER_H_
 
+#include <stdint.h>
+
 #include "base/metrics/field_trial.h"
 
 namespace base {
@@ -15,7 +17,7 @@ class MockEntropyProvider : public base::FieldTrial::EntropyProvider {
 
   // base::FieldTrial::EntropyProvider:
   double GetEntropyForTrial(const std::string& trial_name,
-                            uint32 randomization_seed) const override;
+                            uint32_t randomization_seed) const override;
 };
 
 }  // namespace base
diff --git a/base/test/mock_log.h b/base/test/mock_log.h
index 315ef1f..cda2fcd 100644
--- a/base/test/mock_log.h
+++ b/base/test/mock_log.h
@@ -5,6 +5,8 @@
 #ifndef BASE_TEST_MOCK_LOG_H_
 #define BASE_TEST_MOCK_LOG_H_
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/logging.h"
diff --git a/base/test/multiprocess_test.cc b/base/test/multiprocess_test.cc
index 2cd6d8c..5a3208a 100644
--- a/base/test/multiprocess_test.cc
+++ b/base/test/multiprocess_test.cc
@@ -8,6 +8,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "build/build_config.h"
 
 namespace base {
 
diff --git a/base/test/multiprocess_test.h b/base/test/multiprocess_test.h
index b1c73df..ab1d0ca4 100644
--- a/base/test/multiprocess_test.h
+++ b/base/test/multiprocess_test.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/process/launch.h"
 #include "base/process/process.h"
 #include "build/build_config.h"
diff --git a/base/test/null_task_runner.h b/base/test/null_task_runner.h
index 0f447513..f1eac45 100644
--- a/base/test/null_task_runner.h
+++ b/base/test/null_task_runner.h
@@ -5,8 +5,8 @@
 #ifndef BASE_TEST_NULL_TASK_RUNNER_H_
 #define BASE_TEST_NULL_TASK_RUNNER_H_
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 
 namespace base {
diff --git a/base/test/perf_test_suite.cc b/base/test/perf_test_suite.cc
index 415aaef..58cc4f9 100644
--- a/base/test/perf_test_suite.cc
+++ b/base/test/perf_test_suite.cc
@@ -11,6 +11,7 @@
 #include "base/process/launch.h"
 #include "base/strings/string_util.h"
 #include "base/test/perf_log.h"
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
diff --git a/base/test/perf_time_logger.h b/base/test/perf_time_logger.h
index 403b272..a5f3e8a 100644
--- a/base/test/perf_time_logger.h
+++ b/base/test/perf_time_logger.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/timer/elapsed_timer.h"
 
 namespace base {
diff --git a/base/test/run_all_unittests.cc b/base/test/run_all_unittests.cc
index e5c5975..5e7fe0d 100644
--- a/base/test/run_all_unittests.cc
+++ b/base/test/run_all_unittests.cc
@@ -5,6 +5,7 @@
 #include "base/bind.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
+#include "build/build_config.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
diff --git a/base/test/scoped_locale.h b/base/test/scoped_locale.h
index a9f9348..ef64e98 100644
--- a/base/test/scoped_locale.h
+++ b/base/test/scoped_locale.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace base {
 
diff --git a/base/test/scoped_path_override.h b/base/test/scoped_path_override.h
index c6cffe2..f589149 100644
--- a/base/test/scoped_path_override.h
+++ b/base/test/scoped_path_override.h
@@ -5,8 +5,8 @@
 #ifndef BASE_TEST_SCOPED_PATH_OVERRIDE_H_
 #define BASE_TEST_SCOPED_PATH_OVERRIDE_H_
 
-#include "base/basictypes.h"
 #include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
 
 namespace base {
 
diff --git a/base/test/sequenced_task_runner_test_template.h b/base/test/sequenced_task_runner_test_template.h
index 31d05bc..d0717cd 100644
--- a/base/test/sequenced_task_runner_test_template.h
+++ b/base/test/sequenced_task_runner_test_template.h
@@ -14,9 +14,9 @@
 #include <iosfwd>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner.h"
 #include "base/synchronization/condition_variable.h"
diff --git a/base/test/sequenced_worker_pool_owner.h b/base/test/sequenced_worker_pool_owner.h
index 20bffb1..05fc750 100644
--- a/base/test/sequenced_worker_pool_owner.h
+++ b/base/test/sequenced_worker_pool_owner.h
@@ -5,12 +5,14 @@
 #ifndef BASE_TEST_SEQUENCED_WORKER_POOL_OWNER_H_
 #define BASE_TEST_SEQUENCED_WORKER_POOL_OWNER_H_
 
+#include <stddef.h>
+
 #include <cstddef>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/synchronization/lock.h"
diff --git a/base/test/task_runner_test_template.h b/base/test/task_runner_test_template.h
index 6022753..df42da6 100644
--- a/base/test/task_runner_test_template.h
+++ b/base/test/task_runner_test_template.h
@@ -57,10 +57,10 @@
 #include <cstddef>
 #include <map>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/condition_variable.h"
diff --git a/base/test/test_discardable_memory_allocator.h b/base/test/test_discardable_memory_allocator.h
index df9d469..142b328 100644
--- a/base/test/test_discardable_memory_allocator.h
+++ b/base/test/test_discardable_memory_allocator.h
@@ -5,6 +5,9 @@
 #ifndef BASE_TEST_TEST_DISCARDABLE_MEMORY_ALLOCATOR_H_
 #define BASE_TEST_TEST_DISCARDABLE_MEMORY_ALLOCATOR_H_
 
+#include <stddef.h>
+
+#include "base/macros.h"
 #include "base/memory/discardable_memory_allocator.h"
 
 namespace base {
diff --git a/base/test/test_file_util.h b/base/test/test_file_util.h
index 27197f2..7042e48 100644
--- a/base/test/test_file_util.h
+++ b/base/test/test_file_util.h
@@ -7,14 +7,17 @@
 
 // File utility functions used only by tests.
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
+#include "base/macros.h"
+#include "build/build_config.h"
 
 #if defined(OS_ANDROID)
 #include <jni.h>
-#include "base/basictypes.h"
 #endif
 
 namespace base {
diff --git a/base/test/test_file_util_mac.cc b/base/test/test_file_util_mac.cc
index 11592c3..174a31d 100644
--- a/base/test/test_file_util_mac.cc
+++ b/base/test/test_file_util_mac.cc
@@ -6,6 +6,7 @@
 
 #include <sys/mman.h>
 #include <errno.h>
+#include <stdint.h>
 
 #include "base/files/file_util.h"
 #include "base/files/memory_mapped_file.h"
@@ -19,7 +20,7 @@ bool EvictFileFromSystemCache(const FilePath& file) {
   // default) + MAP_SHARED, then do an msync to invalidate the memory.  The next
   // open should then have to load the file from disk.
 
-  int64 length;
+  int64_t length;
   if (!GetFileSize(file, &length)) {
     DLOG(ERROR) << "failed to get size of " << file.value();
     return false;
@@ -38,7 +39,7 @@ bool EvictFileFromSystemCache(const FilePath& file) {
     return false;
   }
 
-  if (msync(const_cast<uint8*>(mapped_file.data()), mapped_file.length(),
+  if (msync(const_cast<uint8_t*>(mapped_file.data()), mapped_file.length(),
             MS_INVALIDATE) != 0) {
     DLOG(WARNING) << "failed to invalidate memory map of " << file.value()
                   << ", errno: " << errno;
diff --git a/base/test/test_file_util_posix.cc b/base/test/test_file_util_posix.cc
index 12b892c..b817283 100644
--- a/base/test/test_file_util_posix.cc
+++ b/base/test/test_file_util_posix.cc
@@ -6,6 +6,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <stddef.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -16,6 +17,7 @@
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 
 namespace base {
 
diff --git a/base/test/test_file_util_win.cc b/base/test/test_file_util_win.cc
index d2d6ac3..d546c22 100644
--- a/base/test/test_file_util_win.cc
+++ b/base/test/test_file_util_win.cc
@@ -7,6 +7,7 @@
 #include <windows.h>
 #include <aclapi.h>
 #include <shlwapi.h>
+#include <stddef.h>
 
 #include <vector>
 
diff --git a/base/test/test_mock_time_task_runner.cc b/base/test/test_mock_time_task_runner.cc
index f2e18a3..5a388f2 100644
--- a/base/test/test_mock_time_task_runner.cc
+++ b/base/test/test_mock_time_task_runner.cc
@@ -5,6 +5,7 @@
 #include "base/test/test_mock_time_task_runner.h"
 
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/clock.h"
 #include "base/time/tick_clock.h"
diff --git a/base/test/test_mock_time_task_runner.h b/base/test/test_mock_time_task_runner.h
index 6319e0c..316e6a6 100644
--- a/base/test/test_mock_time_task_runner.h
+++ b/base/test/test_mock_time_task_runner.h
@@ -5,6 +5,8 @@
 #ifndef BASE_TEST_TEST_MOCK_TIME_TASK_RUNNER_H_
 #define BASE_TEST_TEST_MOCK_TIME_TASK_RUNNER_H_
 
+#include <stddef.h>
+
 #include <queue>
 #include <vector>
 
diff --git a/base/test/test_reg_util_win.cc b/base/test/test_reg_util_win.cc
index fdb9163..83c7fe6 100644
--- a/base/test/test_reg_util_win.cc
+++ b/base/test/test_reg_util_win.cc
@@ -4,6 +4,8 @@
 
 #include "base/test/test_reg_util_win.h"
 
+#include <stdint.h>
+
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ -38,7 +40,7 @@ void DeleteStaleTestKeys(const base::Time& now,
         base::SPLIT_WANT_NONEMPTY);
     if (tokens.empty())
       continue;
-    int64 key_name_as_number = 0;
+    int64_t key_name_as_number = 0;
 
     if (!base::StringToInt64(tokens[0], &key_name_as_number)) {
       test_root_key.DeleteKey(key_name.c_str());
diff --git a/base/test/test_reg_util_win.h b/base/test/test_reg_util_win.h
index c264402..69f5fdd 100644
--- a/base/test/test_reg_util_win.h
+++ b/base/test/test_reg_util_win.h
@@ -8,7 +8,7 @@
 // Registry utility functions used only by tests.
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
diff --git a/base/test/test_simple_task_runner.h b/base/test/test_simple_task_runner.h
index 7481b6d..338c634 100644
--- a/base/test/test_simple_task_runner.h
+++ b/base/test/test_simple_task_runner.h
@@ -7,8 +7,8 @@
 
 #include <deque>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/test_pending_task.h"
 #include "base/threading/thread_checker.h"
diff --git a/base/test/test_suite.cc b/base/test/test_suite.cc
index 3a6c2b0..82510a2 100644
--- a/base/test/test_suite.cc
+++ b/base/test/test_suite.cc
@@ -16,6 +16,7 @@
 #include "base/files/file_util.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
@@ -27,6 +28,7 @@
 #include "base/test/test_switches.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
diff --git a/base/test/test_suite.h b/base/test/test_suite.h
index e63ef32..68590eb 100644
--- a/base/test/test_suite.h
+++ b/base/test/test_suite.h
@@ -12,8 +12,10 @@
 #include <string>
 
 #include "base/at_exit.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/trace_to_file.h"
+#include "build/build_config.h"
 
 namespace testing {
 class TestInfo;
diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc
index a0f825c8..a8cadec 100644
--- a/base/test/test_support_android.cc
+++ b/base/test/test_support_android.cc
@@ -8,6 +8,7 @@
 #include "base/android/path_utils.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_pump_android.h"
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index b30d6c3..55e9a79 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -11,6 +11,7 @@
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/test_switches.h"
+#include "build/build_config.h"
 
 namespace {
 
diff --git a/base/test/test_timeouts.h b/base/test/test_timeouts.h
index 2819e4a..ddaf05b 100644
--- a/base/test/test_timeouts.h
+++ b/base/test/test_timeouts.h
@@ -5,8 +5,8 @@
 #ifndef BASE_TEST_TEST_TIMEOUTS_H_
 #define BASE_TEST_TEST_TIMEOUTS_H_
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/time/time.h"
 
 // Returns common timeouts to use in tests. Makes it possible to adjust
diff --git a/base/test/thread_test_helper.h b/base/test/thread_test_helper.h
index 926da73..829a619 100644
--- a/base/test/thread_test_helper.h
+++ b/base/test/thread_test_helper.h
@@ -6,6 +6,7 @@
 #define BASE_TEST_THREAD_TEST_HELPER_H_
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
diff --git a/base/test/trace_event_analyzer.cc b/base/test/trace_event_analyzer.cc
index 0a0ff7f..2046355 100644
--- a/base/test/trace_event_analyzer.cc
+++ b/base/test/trace_event_analyzer.cc
@@ -4,8 +4,9 @@
 
 #include "base/test/trace_event_analyzer.h"
 
-#include <algorithm>
 #include <math.h>
+
+#include <algorithm>
 #include <set>
 
 #include "base/json/json_reader.h"
@@ -219,11 +220,11 @@ Query Query::Double(double num) {
   return Query(num);
 }
 
-Query Query::Int(int32 num) {
+Query Query::Int(int32_t num) {
   return Query(static_cast<double>(num));
 }
 
-Query Query::Uint(uint32 num) {
+Query Query::Uint(uint32_t num) {
   return Query(static_cast<double>(num));
 }
 
@@ -380,8 +381,8 @@ bool Query::EvaluateArithmeticOperator(const TraceEvent& event,
       *num = lhs / rhs;
       return true;
     case OP_MOD:
-      *num = static_cast<double>(static_cast<int64>(lhs) %
-                                 static_cast<int64>(rhs));
+      *num = static_cast<double>(static_cast<int64_t>(lhs) %
+                                 static_cast<int64_t>(rhs));
       return true;
     case OP_NEGATE:
       *num = -lhs;
diff --git a/base/test/trace_event_analyzer.h b/base/test/trace_event_analyzer.h
index 57ff2b5..f67445a 100644
--- a/base/test/trace_event_analyzer.h
+++ b/base/test/trace_event_analyzer.h
@@ -76,8 +76,12 @@
 #ifndef BASE_TEST_TRACE_EVENT_ANALYZER_H_
 #define BASE_TEST_TRACE_EVENT_ANALYZER_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/trace_event/trace_event.h"
 
@@ -183,8 +187,8 @@ class Query {
 
   // Compare with the given number.
   static Query Double(double num);
-  static Query Int(int32 num);
-  static Query Uint(uint32 num);
+  static Query Int(int32_t num);
+  static Query Uint(uint32_t num);
 
   // Compare with the given bool.
   static Query Bool(bool boolean);
@@ -406,7 +410,7 @@ class Query {
   Query operator*(const Query& rhs) const;
   Query operator/(const Query& rhs) const;
   Query operator-() const;
-  // Mod operates on int64 args (doubles are casted to int64 beforehand):
+  // Mod operates on int64_t args (doubles are casted to int64_t beforehand):
   Query operator%(const Query& rhs) const;
 
   // Return true if the given event matches this query tree.
diff --git a/base/test/trace_event_analyzer_unittest.cc b/base/test/trace_event_analyzer_unittest.cc
index 6503b1f..700b920 100644
--- a/base/test/trace_event_analyzer_unittest.cc
+++ b/base/test/trace_event_analyzer_unittest.cc
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/trace_event_analyzer.h"
@@ -399,7 +402,7 @@ TEST_F(TraceEventAnalyzerTest, BeginEndDuration) {
   const base::TimeDelta kSleepTime = base::TimeDelta::FromMilliseconds(200);
   // We will search for events that have a duration of greater than 90% of the
   // sleep time, so that there is no flakiness.
-  int64 duration_cutoff_us = (kSleepTime.InMicroseconds() * 9) / 10;
+  int64_t duration_cutoff_us = (kSleepTime.InMicroseconds() * 9) / 10;
 
   BeginTracing();
   {
@@ -445,7 +448,7 @@ TEST_F(TraceEventAnalyzerTest, CompleteDuration) {
   const base::TimeDelta kSleepTime = base::TimeDelta::FromMilliseconds(200);
   // We will search for events that have a duration of greater than 90% of the
   // sleep time, so that there is no flakiness.
-  int64 duration_cutoff_us = (kSleepTime.InMicroseconds() * 9) / 10;
+  int64_t duration_cutoff_us = (kSleepTime.InMicroseconds() * 9) / 10;
 
   BeginTracing();
   {
diff --git a/base/test/user_action_tester.h b/base/test/user_action_tester.h
index 6b0efc5..620988b 100644
--- a/base/test/user_action_tester.h
+++ b/base/test/user_action_tester.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 
+#include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 
 namespace base {