Switch to standard integer types in base/test/.

base/test/test_timeouts.h

 // Copyright (c) 2012 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_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
 // the timeouts for different environments (like Valgrind).
 class TestTimeouts {
  public:
   // Initializes the timeouts. Non thread-safe. Should be called exactly once
   // by the test suite.
   static void Initialize();
 
@@ skipping 30 matching lines @@
 
   static int tiny_timeout_ms_;
   static int action_timeout_ms_;
   static int action_max_timeout_ms_;
   static int test_launcher_timeout_ms_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(TestTimeouts);
 };
 
 #endif  // BASE_TEST_TEST_TIMEOUTS_H_