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

components/invalidation/impl/invalidator_registrar.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.
 
 #ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_REGISTRAR_H_
 #define COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_REGISTRAR_H_
 
 #include <map>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/threading/thread_checker.h"
 #include "components/invalidation/public/invalidation_export.h"
 #include "components/invalidation/public/invalidation_handler.h"
 #include "components/invalidation/public/invalidation_util.h"
 
 namespace invalidation {
 class ObjectId;
 }  // namespace invalidation
 
@@ skipping 67 matching lines @@
   base::ObserverList<InvalidationHandler, true> handlers_;
   HandlerIdsMap handler_to_ids_map_;
   InvalidatorState state_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidatorRegistrar);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATOR_REGISTRAR_H_