Switch to standard integer types in google_apis/.

google_apis/gcm/engine/gservices_settings.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/gservices_settings.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "google_apis/gcm/engine/gservices_switches.h"
 
 namespace {
 // The expected time in seconds between periodic checkins.
 const char kCheckinIntervalKey[] = "checkin_interval";
 // The override URL to the checkin server.
 const char kCheckinURLKey[] = "checkin_url";
 // The MCS machine name to connect to.
 const char kMCSHostnameKey[] = "gcm_hostname";
 // The MCS port to connect to.
 const char kMCSSecurePortKey[] = "gcm_secure_port";
 // The URL to get MCS registration IDs.
 const char kRegistrationURLKey[] = "gcm_registration_url";
 
-const int64 kDefaultCheckinInterval = 2 * 24 * 60 * 60;  // seconds = 2 days.
-const int64 kMinimumCheckinInterval = 12 * 60 * 60;      // seconds = 12 hours.
+const int64_t kDefaultCheckinInterval = 2 * 24 * 60 * 60;  // seconds = 2 days.
+const int64_t kMinimumCheckinInterval = 12 * 60 * 60;  // seconds = 12 hours.
 const char kDefaultCheckinURL[] = "https://android.clients.google.com/checkin";
 const char kDefaultMCSHostname[] = "mtalk.google.com";
 const int kDefaultMCSMainSecurePort = 5228;
 const int kDefaultMCSFallbackSecurePort = 443;
 const char kDefaultRegistrationURL[] =
     "https://android.clients.google.com/c2dm/register3";
 // Settings that are to be deleted are marked with this prefix in checkin
 // response.
 const char kDeleteSettingPrefix[] = "delete_";
 // Settings digest starts with verison number followed by '-'.
@@ skipping 15 matching lines @@
          settings_name == kRegistrationURLKey;
 }
 
 bool VerifyCheckinInterval(
     const gcm::GServicesSettings::SettingsMap& settings) {
   gcm::GServicesSettings::SettingsMap::const_iterator iter =
       settings.find(kCheckinIntervalKey);
   if (iter == settings.end())
     return CanBeOmitted(kCheckinIntervalKey);
 
-  int64 checkin_interval = kMinimumCheckinInterval;
+  int64_t checkin_interval = kMinimumCheckinInterval;
   if (!base::StringToInt64(iter->second, &checkin_interval)) {
     DVLOG(1) << "Failed to parse checkin interval: " << iter->second;
     return false;
   }
-  if (checkin_interval == std::numeric_limits<int64>::max()) {
+  if (checkin_interval == std::numeric_limits<int64_t>::max()) {
     DVLOG(1) << "Checkin interval is too big: " << checkin_interval;
     return false;
   }
   if (checkin_interval < kMinimumCheckinInterval) {
     DVLOG(1) << "Checkin interval: " << checkin_interval
              << " is less than allowed minimum: " << kMinimumCheckinInterval;
   }
 
   return true;
 }
@@ skipping 177 matching lines @@
              << "Expected digest: " << load_result.gservices_digest
              << ". Calculated digest is: " << digest;
     return;
   }
 
   settings_ = load_result.gservices_settings;
   digest_ = load_result.gservices_digest;
 }
 
 base::TimeDelta GServicesSettings::GetCheckinInterval() const {
-  int64 checkin_interval = kMinimumCheckinInterval;
+  int64_t checkin_interval = kMinimumCheckinInterval;
   SettingsMap::const_iterator iter = settings_.find(kCheckinIntervalKey);
   if (iter == settings_.end() ||
       !base::StringToInt64(iter->second, &checkin_interval)) {
     checkin_interval = kDefaultCheckinInterval;
   }
 
   if (checkin_interval < kMinimumCheckinInterval)
     checkin_interval = kMinimumCheckinInterval;
 
   return base::TimeDelta::FromSeconds(checkin_interval);
@@ skipping 70 matching lines @@
         command_line->GetSwitchValueASCII(switches::kGCMRegistrationURL));
   }
 
   SettingsMap::const_iterator iter = settings_.find(kRegistrationURLKey);
   if (iter == settings_.end() || iter->second.empty())
     return GURL(kDefaultRegistrationURL);
   return GURL(iter->second);
 }
 
 }  // namespace gcm