| Index: google_apis/gcm/engine/registration_request.cc
|
| diff --git a/google_apis/gcm/engine/registration_request.cc b/google_apis/gcm/engine/registration_request.cc
|
| index fa66a7777dc93364a582feb70c2c89c5e4e316b0..c0ed642dc10b0e4d20ee0f536d5b742f1f65c8b7 100644
|
| --- a/google_apis/gcm/engine/registration_request.cc
|
| +++ b/google_apis/gcm/engine/registration_request.cc
|
| @@ -4,8 +4,11 @@
|
|
|
| #include "google_apis/gcm/engine/registration_request.h"
|
|
|
| +#include <stddef.h>
|
| +
|
| #include "base/bind.h"
|
| #include "base/location.h"
|
| +#include "base/macros.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/metrics/histogram.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -69,13 +72,10 @@ bool ShouldRetryWithStatus(RegistrationRequest::Status status) {
|
|
|
| } // namespace
|
|
|
| -RegistrationRequest::RequestInfo::RequestInfo(
|
| - uint64 android_id,
|
| - uint64 security_token,
|
| - const std::string& app_id)
|
| - : android_id(android_id),
|
| - security_token(security_token),
|
| - app_id(app_id) {
|
| +RegistrationRequest::RequestInfo::RequestInfo(uint64_t android_id,
|
| + uint64_t security_token,
|
| + const std::string& app_id)
|
| + : android_id(android_id), security_token(security_token), app_id(app_id) {
|
| DCHECK(android_id != 0UL);
|
| DCHECK(security_token != 0UL);
|
| }
|
|
|