Switch to standard integer types in google_apis/.

google_apis/gcm/engine/checkin_request.h

Index: google_apis/gcm/engine/checkin_request.h
diff --git a/google_apis/gcm/engine/checkin_request.h b/google_apis/gcm/engine/checkin_request.h
index 619a8f94458fcb3be83fd79365a1ddaa96a1974d..f77e66d7bb449a29dfeab50349343f2a9c8c6691 100644
--- a/google_apis/gcm/engine/checkin_request.h
+++ b/google_apis/gcm/engine/checkin_request.h
@@ -5,10 +5,12 @@
 #ifndef GOOGLE_APIS_GCM_ENGINE_CHECKIN_REQUEST_H_
 #define GOOGLE_APIS_GCM_ENGINE_CHECKIN_REQUEST_H_
 
+#include <stdint.h>
+
 #include <string>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "google_apis/gcm/base/gcm_export.h"
@@ -39,17 +41,17 @@ class GCM_EXPORT CheckinRequest : public net::URLFetcherDelegate {
 
   // Checkin request details.
   struct GCM_EXPORT RequestInfo {
-    RequestInfo(uint64 android_id,
-                uint64 security_token,
+    RequestInfo(uint64_t android_id,
+                uint64_t security_token,
                 const std::map<std::string, std::string>& account_tokens,
                 const std::string& settings_digest,
                 const checkin_proto::ChromeBuildProto& chrome_build_proto);
     ~RequestInfo();
 
     // Android ID of the device.
-    uint64 android_id;
+    uint64_t android_id;
     // Security token of the device.
-    uint64 security_token;
+    uint64_t security_token;
     // Map of account OAuth2 tokens keyed by emails.
     std::map<std::string, std::string> account_tokens;
     // Digest of GServices settings on the device.