Switch to standard integer types in base/win/.

base/win/scoped_propvariant.h

 // Copyright (c) 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_WIN_SCOPED_PROPVARIANT_H_
 #define BASE_WIN_SCOPED_PROPVARIANT_H_
 
 #include <propidl.h>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
+#include "base/macros.h"
 
 namespace base {
 namespace win {
 
 // A PROPVARIANT that is automatically initialized and cleared upon respective
 // construction and destruction of this class.
 class ScopedPropVariant {
  public:
   ScopedPropVariant() {
     PropVariantInit(&pv_);
@@ skipping 27 matching lines @@
   // Comparison operators for ScopedPropVariant are not supported at this point.
   bool operator==(const ScopedPropVariant&) const;
   bool operator!=(const ScopedPropVariant&) const;
   DISALLOW_COPY_AND_ASSIGN(ScopedPropVariant);
 };
 
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_WIN_SCOPED_PROPVARIANT_H_