Switch to standard integer types in base/prefs/.

base/prefs/scoped_user_pref_update.h

 // Copyright 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.
 //
 // A helper class that assists preferences in firing notifications when lists
 // or dictionaries are changed.
 
 #ifndef BASE_PREFS_SCOPED_USER_PREF_UPDATE_H_
 #define BASE_PREFS_SCOPED_USER_PREF_UPDATE_H_
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/prefs/base_prefs_export.h"
 #include "base/prefs/pref_service.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/values.h"
 
 class PrefService;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
@@ skipping 75 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ScopedUserPrefUpdate);
 };
 
 typedef ScopedUserPrefUpdate<base::DictionaryValue,
                              base::Value::TYPE_DICTIONARY>
     DictionaryPrefUpdate;
 typedef ScopedUserPrefUpdate<base::ListValue, base::Value::TYPE_LIST>
     ListPrefUpdate;
 
 #endif  // BASE_PREFS_SCOPED_USER_PREF_UPDATE_H_