Switch to standard integer types in base/test/.

base/test/launcher/test_launcher.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 
 namespace testing {
 class TestCase;
 class TestInfo;
 }
@@ skipping 120 matching lines @@
   // Make sure we don't accidentally call the wrong methods e.g. on the worker
   // pool thread. With lots of callbacks used this is non-trivial.
   // Should be the first member so that it's destroyed last: when destroying
   // other members, especially the worker pool, we may check the code is running
   // on the correct thread.
   ThreadChecker thread_checker_;
 
   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.
 
   // Test filters (empty means no filter).
   std::vector<std::string> positive_test_filter_;
   std::vector<std::string> negative_test_filter_;
 
   // Tests to use (cached result of TestLauncherDelegate::GetTests).
   std::vector<TestIdentifier> tests_;
 
@@ skipping 43 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestLauncher);
 };
 
 // Extract part from |full_output| that applies to |result|.
 std::string GetTestOutputSnippet(const TestResult& result,
                                  const std::string& full_output);
 
 }  // namespace base
 
 #endif  // BASE_TEST_LAUNCHER_TEST_LAUNCHER_H_