Switch to standard integer types in chrome/.

chrome/installer/util/registry_test_data.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 CHROME_INSTALLER_UTIL_REGISTRY_TEST_DATA_H_
 #define CHROME_INSTALLER_UTIL_REGISTRY_TEST_DATA_H_
 
 #include <windows.h>
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 // A helper class for use by unit tests that need some registry space and data.
 // BEWARE: Instances of this class irrevocably and recursively delete keys and
 // values from the registry.  Carefully read the comments for Initialize and
 // Reset before use.
 class RegistryTestData {
  public:
   RegistryTestData();
   // Invokes Reset() on its way out.
   ~RegistryTestData();
@@ skipping 26 matching lines @@
 
   HKEY root_key_;
   std::wstring base_path_;
   std::wstring empty_key_path_;
   std::wstring non_empty_key_path_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistryTestData);
 };
 
 #endif  // CHROME_INSTALLER_UTIL_REGISTRY_TEST_DATA_H_