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

components/invalidation/impl/invalidation_service_android.h

 // Copyright (c) 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.
 
 #ifndef COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_ANDROID_H_
 #define COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_ANDROID_H_
 
 #include <jni.h>
+#include <stdint.h>
+
 #include <map>
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "components/invalidation/impl/invalidation_logger.h"
 #include "components/invalidation/impl/invalidator_registrar.h"
 #include "components/invalidation/public/invalidation_service.h"
 #include "components/keyed_service/core/keyed_service.h"
 
 namespace invalidation {
 
 class InvalidationLogger;
@@ skipping 32 matching lines @@
                   jlong version,
                   const base::android::JavaParamRef<jstring>& state);
 
   // The InvalidationServiceAndroid always reports that it is enabled.
   // This is used only by unit tests.
   void TriggerStateChangeForTest(syncer::InvalidatorState state);
 
   static bool RegisterJni(JNIEnv* env);
 
  private:
-  typedef std::map<invalidation::ObjectId,
-                   int64,
-                   syncer::ObjectIdLessThan> ObjectIdVersionMap;
+  typedef std::map<invalidation::ObjectId, int64_t, syncer::ObjectIdLessThan>
+      ObjectIdVersionMap;
 
   // Friend class so that InvalidationServiceFactoryAndroid has access to
   // private member object java_ref_.
   friend class InvalidationServiceFactoryAndroid;
 
   // Points to a Java instance of InvalidationService.
   base::android::ScopedJavaGlobalRef<jobject> java_ref_;
 
   syncer::InvalidatorRegistrar invalidator_registrar_;
   syncer::InvalidatorState invalidator_state_;
 
   // The invalidation API spec allows for the possibility of redundant
   // invalidations, so keep track of the max versions and drop
   // invalidations with old versions.
   ObjectIdVersionMap max_invalidation_versions_;
 
   // The invalidation logger object we use to record state changes
   // and invalidations.
   InvalidationLogger logger_;
 
   DISALLOW_COPY_AND_ASSIGN(InvalidationServiceAndroid);
 };
 
 }  // namespace invalidation
 
 #endif  // COMPONENTS_INVALIDATION_IMPL_INVALIDATION_SERVICE_ANDROID_H_