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

components/invalidation/impl/invalidation_service_android.h

Index: components/invalidation/impl/invalidation_service_android.h
diff --git a/components/invalidation/impl/invalidation_service_android.h b/components/invalidation/impl/invalidation_service_android.h
index c8c2a3df13dc800cf6a2a83fb27999b80707e315..3424a9170abf34902c2e903e81289057832f8db2 100644
--- a/components/invalidation/impl/invalidation_service_android.h
+++ b/components/invalidation/impl/invalidation_service_android.h
@@ -6,12 +6,14 @@
 #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"
@@ -64,9 +66,8 @@ class InvalidationServiceAndroid
   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_.