Switch to standard integer types in google_apis/.

google_apis/gcm/engine/registration_request.h

Index: google_apis/gcm/engine/registration_request.h
diff --git a/google_apis/gcm/engine/registration_request.h b/google_apis/gcm/engine/registration_request.h
index bcc3ee04fe200961bcbb96fc6889d529fb7be03e..14427a70626b8c25b6fea2ff92492872d2bbc55a 100644
--- a/google_apis/gcm/engine/registration_request.h
+++ b/google_apis/gcm/engine/registration_request.h
@@ -5,12 +5,14 @@
 #ifndef GOOGLE_APIS_GCM_ENGINE_REGISTRATION_REQUEST_H_
 #define GOOGLE_APIS_GCM_ENGINE_REGISTRATION_REQUEST_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/callback.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -63,15 +65,15 @@ class GCM_EXPORT RegistrationRequest : public net::URLFetcherDelegate {
   // Defines the common info about a registration/token request. All parameters
   // are mandatory.
   struct GCM_EXPORT RequestInfo {
-    RequestInfo(uint64 android_id,
-                uint64 security_token,
+    RequestInfo(uint64_t android_id,
+                uint64_t security_token,
                 const std::string& app_id);
     ~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;
     // Application ID.
     std::string app_id;
   };