Switch to standard integer types in google_apis/.

google_apis/gcm/engine/gcm_store.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef GOOGLE_APIS_GCM_ENGINE_GCM_STORE_H_
 #define GOOGLE_APIS_GCM_ENGINE_GCM_STORE_H_
 
 #include <map>
 #include <set>
 #include <string>
 #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"
 #include "base/time/time.h"
 #include "google_apis/gcm/base/gcm_export.h"
 #include "google_apis/gcm/engine/account_mapping.h"
 
 namespace gcm {
 
 class MCSMessage;
@@ skipping 16 matching lines @@
 
   // Container for Load(..) results.
   struct GCM_EXPORT LoadResult {
     LoadResult();
     ~LoadResult();
 
     void Reset();
 
     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;
     std::map<std::string, std::string> gservices_settings;
     std::string gservices_digest;
     base::Time last_checkin_time;
     std::set<std::string> last_checkin_accounts;
     AccountMappings account_mappings;
     base::Time last_token_fetch_time;
     std::map<std::string, int> heartbeat_intervals;
@@ skipping 11 matching lines @@
   // caller.
   virtual void Load(StoreOpenMode open_mode, const LoadCallback& callback) = 0;
 
   // Close the persistent store.
   virtual void Close() = 0;
 
   // Clears the GCM store of all data.
   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.
   // For GCM, |serialized_key| is app_id and |serialized_value| is
   // serialization of (senders, registration_id). For InstanceID,
   // |serialized_key| is serialization of (app_id, authorized_entity, scope)
   // and |serialized_value| is token.
   virtual void AddRegistration(const std::string& serialized_key,
                                const std::string& serialized_value,
                                const UpdateCallback& callback) = 0;
@@ skipping 60 matching lines @@
   virtual void RemoveInstanceIDData(const std::string& app_id,
                                     const UpdateCallback& callback) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GCMStore);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_GCM_STORE_H_