Switch to standard integer types in google_apis/.

google_apis/gcm/engine/gcm_store_impl.h

Index: google_apis/gcm/engine/gcm_store_impl.h
diff --git a/google_apis/gcm/engine/gcm_store_impl.h b/google_apis/gcm/engine/gcm_store_impl.h
index af89cff4352f2e0c60c8d86e602e81295e8bfa9a..5fe06a595f27f382dc30eaaf668f1595ac6abfbd 100644
--- a/google_apis/gcm/engine/gcm_store_impl.h
+++ b/google_apis/gcm/engine/gcm_store_impl.h
@@ -5,7 +5,9 @@
 #ifndef GOOGLE_APIS_GCM_ENGINE_GCM_STORE_IMPL_H_
 #define GOOGLE_APIS_GCM_ENGINE_GCM_STORE_IMPL_H_
 
-#include "base/basictypes.h"
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "google_apis/gcm/base/gcm_export.h"
@@ -44,8 +46,8 @@ class GCM_EXPORT GCMStoreImpl : public GCMStore {
   void Destroy(const UpdateCallback& callback) override;
 
   // Sets this device's messaging credentials.
-  void SetDeviceCredentials(uint64 device_android_id,
-                            uint64 device_security_token,
+  void SetDeviceCredentials(uint64_t device_android_id,
+                            uint64_t device_security_token,
                             const UpdateCallback& callback) override;
 
   // Registration info.