Switch to standard integer types in google_apis/.

google_apis/gcm/engine/unregistration_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_UNREGISTRATION_REQUEST_H_
 #define GOOGLE_APIS_GCM_ENGINE_UNREGISTRATION_REQUEST_H_
 
-#include "base/basictypes.h"
+#include <stdint.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"
 #include "base/time/time.h"
 #include "google_apis/gcm/base/gcm_export.h"
 #include "net/base/backoff_entry.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "url/gurl.h"
 
 namespace net {
@@ skipping 32 matching lines @@
     // histogram enum accordingly.
     UNREGISTRATION_STATUS_COUNT,
   };
 
   // Callback completing the unregistration request.
   typedef base::Callback<void(Status success)> UnregistrationCallback;
 
   // Defines the common info about an unregistration/token-deletion 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;
   };
 
   // Encapsulates the custom logic that is needed to build and process the
   // unregistration request.
   class GCM_EXPORT CustomRequestHandler {
    public:
     CustomRequestHandler();
     virtual ~CustomRequestHandler();
@@ skipping 58 matching lines @@
   std::string source_to_record_;
 
   base::WeakPtrFactory<UnregistrationRequest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UnregistrationRequest);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_UNREGISTRATION_REQUEST_H_