Switch to standard integer types in base/test/.

base/test/test_reg_util_win.h

 // Copyright (c) 2011 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_REG_UTIL_WIN_H_
 #define BASE_TEST_TEST_REG_UTIL_WIN_H_
 
 // 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"
 #include "base/win/registry.h"
 
 namespace registry_util {
 
 // Allows a test to easily override registry hives so that it can start from a
 // known good state, or make sure to not leave any side effects once the test
 // completes. This supports parallel tests. All the overrides are scoped to the
@@ skipping 47 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RegistryOverrideManager);
 };
 
 // Generates a temporary key path that will be eventually deleted
 // automatically if the process crashes.
 base::string16 GenerateTempKeyPath();
 
 }  // namespace registry_util
 
 #endif  // BASE_TEST_TEST_REG_UTIL_WIN_H_