Switch to standard integer types in base/prefs/.

base/prefs/pref_value_map.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_PREFS_PREF_VALUE_MAP_H_
 #define BASE_PREFS_PREF_VALUE_MAP_H_
 
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/base_prefs_export.h"
 
 namespace base {
 class Value;
 }
 
 // A generic string to value map used by the PrefStore implementations.
 class BASE_PREFS_EXPORT PrefValueMap {
  public:
@@ skipping 59 matching lines @@
   void GetDifferingKeys(const PrefValueMap* other,
                         std::vector<std::string>* differing_keys) const;
 
  private:
   Map prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefValueMap);
 };
 
 #endif  // BASE_PREFS_PREF_VALUE_MAP_H_