Switch to standard integer types in google_apis/.

google_apis/gcm/engine/account_mapping.cc

 // 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.
 
 #include "google_apis/gcm/engine/account_mapping.h"
 
+#include <stdint.h>
+
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 
 namespace gcm {
 
 namespace {
 
 const char kSeparator[] = "&";
-const uint32 kEmailIndex = 0;
-const uint32 kStatusIndex = 1;
-const uint32 kStatusChangeTimestampIndex = 2;
-const uint32 kSizeWithNoMessage = kStatusChangeTimestampIndex + 1;
-const uint32 kMessageIdIndex = 3;
-const uint32 kSizeWithMessage = kMessageIdIndex + 1;
+const uint32_t kEmailIndex = 0;
+const uint32_t kStatusIndex = 1;
+const uint32_t kStatusChangeTimestampIndex = 2;
+const uint32_t kSizeWithNoMessage = kStatusChangeTimestampIndex + 1;
+const uint32_t kMessageIdIndex = 3;
+const uint32_t kSizeWithMessage = kMessageIdIndex + 1;
 
 const char kStatusNew[] = "new";
 const char kStatusAdding[] = "adding";
 const char kStatusMapped[] = "mapped";
 const char kStatusRemoving[] = "removing";
 
 std::string StatusToString(AccountMapping::MappingStatus status) {
   switch (status) {
     case AccountMapping::NEW:
       return kStatusNew;
@@ skipping 65 matching lines @@
   if (values.size() == kSizeWithMessage && values[kMessageIdIndex].empty())
     return false;
 
   MappingStatus temp_status;
   if (!StringToStatus(values[kStatusIndex], &temp_status))
     return false;
 
   if (values.size() == kSizeWithNoMessage && temp_status == ADDING)
     return false;
 
-  int64 status_change_ts_internal = 0LL;
+  int64_t status_change_ts_internal = 0LL;
   if (!base::StringToInt64(values[kStatusChangeTimestampIndex],
                            &status_change_ts_internal)) {
     return false;
   }
 
   status_change_timestamp =
       base::Time::FromInternalValue(status_change_ts_internal);
   status = temp_status;
   email = values[kEmailIndex];
   access_token.clear();
 
   if (values.size() == kSizeWithMessage)
     last_message_id = values[kMessageIdIndex];
   else
     last_message_id.clear();
 
   return true;
 }
 
 }  // namespace gcm