Switch to standard integer types in google_apis/.

google_apis/gcm/engine/gcm_store.h

Index: google_apis/gcm/engine/gcm_store.h
diff --git a/google_apis/gcm/engine/gcm_store.h b/google_apis/gcm/engine/gcm_store.h
index 9375882dbbc3025e71a97676b60cce6ea6c20362..6395edfd14e3c2336e3aa907d840fc4e26ec5bd9 100644
--- a/google_apis/gcm/engine/gcm_store.h
+++ b/google_apis/gcm/engine/gcm_store.h
@@ -11,9 +11,10 @@
 #include <vector>
 
 #include <google/protobuf/message_lite.h>
+#include <stdint.h>
 
-#include "base/basictypes.h"
 #include "base/callback_forward.h"
+#include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -50,8 +51,8 @@ class GCM_EXPORT GCMStore {
 
     bool success;
     bool store_does_not_exist;
-    uint64 device_android_id;
-    uint64 device_security_token;
+    uint64_t device_android_id;
+    uint64_t device_security_token;
     std::map<std::string, std::string> registrations;
     std::vector<std::string> incoming_messages;
     OutgoingMessageMap outgoing_messages;
@@ -83,8 +84,8 @@ class GCM_EXPORT GCMStore {
   virtual void Destroy(const UpdateCallback& callback) = 0;
 
   // Sets this device's messaging credentials.
-  virtual void SetDeviceCredentials(uint64 device_android_id,
-                                    uint64 device_security_token,
+  virtual void SetDeviceCredentials(uint64_t device_android_id,
+                                    uint64_t device_security_token,
                                     const UpdateCallback& callback) = 0;
 
   // Registration info for both GCM registrations and InstanceID tokens.