Switch to standard integer types in components/, part 4 of 4.

components/syncable_prefs/pref_model_associator.h

 // Copyright (c) 2012 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 COMPONENTS_SYNCABLE_PREFS_PREF_MODEL_ASSOCIATOR_H_
 #define COMPONENTS_SYNCABLE_PREFS_PREF_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <set>
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "components/syncable_prefs/synced_pref_observer.h"
 #include "sync/api/sync_data.h"
 #include "sync/api/syncable_service.h"
 
 namespace base {
 class Value;
 }
 
@@ skipping 166 matching lines @@
 
   SyncedPrefObserverMap synced_pref_observers_;
   const PrefModelAssociatorClient* client_;  // Weak.
 
   DISALLOW_COPY_AND_ASSIGN(PrefModelAssociator);
 };
 
 }  // namespace syncable_prefs
 
 #endif  // COMPONENTS_SYNCABLE_PREFS_PREF_MODEL_ASSOCIATOR_H_