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

components/invalidation/impl/registration_manager.h

 // Copyright 2014 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 class that manages the registration of types for server-issued
 // notifications.
 
 #ifndef COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_
 #define COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_
 
 #include <map>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 // For invalidation::InvalidationListener::RegistrationState.
 #include "components/invalidation/public/invalidation_export.h"
 #include "components/invalidation/public/invalidation_util.h"
 #include "google/cacheinvalidation/include/invalidation-listener.h"
 #include "google/cacheinvalidation/include/types.h"
 
 namespace syncer {
@@ skipping 154 matching lines @@
   RegistrationStatusMap registration_statuses_;
   // Weak pointer.
   invalidation::InvalidationClient* invalidation_client_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistrationManager);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_IMPL_REGISTRATION_MANAGER_H_