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}
marcosholgado · Dec 24, 2015 · d351e5a · d351e5a
1 parent 20cc449
commit d351e5a
Show file tree

Hide file tree

Showing 48 changed files with 105 additions and 40 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {