Switch to standard integer types in google_apis/.

google_apis/gcm/engine/checkin_request.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_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"
 #include "google_apis/gcm/protocol/android_checkin.pb.h"
 #include "google_apis/gcm/protocol/checkin.pb.h"
 #include "net/base/backoff_entry.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 namespace net {
@@ skipping 10 matching lines @@
 // check-ins.
 class GCM_EXPORT CheckinRequest : public net::URLFetcherDelegate {
  public:
   // A callback function for the checkin request, accepting |checkin_response|
   // protobuf.
   typedef base::Callback<void(const checkin_proto::AndroidCheckinResponse&
                                   checkin_response)> CheckinRequestCallback;
 
   // 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.
     std::string settings_digest;
     // Information of the Chrome build of this device.
     checkin_proto::ChromeBuildProto chrome_build_proto;
   };
 
   CheckinRequest(const GURL& checkin_url,
                  const RequestInfo& request_info,
@@ skipping 25 matching lines @@
   GCMStatsRecorder* recorder_;
 
   base::WeakPtrFactory<CheckinRequest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CheckinRequest);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_CHECKIN_REQUEST_H_