Switch to standard integer types in google_apis/.

google_apis/gcm/tools/mcs_probe.cc

 // Copyright 2013 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.
 //
 // A standalone tool for testing MCS connections and the MCS client on their
 // own.
 
+#include <stdint.h>
+
 #include <cstddef>
 #include <cstdio>
 #include <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "base/threading/worker_pool.h"
 #include "base/time/default_clock.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "google_apis/gcm/base/fake_encryptor.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/base/mcs_util.h"
 #include "google_apis/gcm/engine/checkin_request.h"
 #include "google_apis/gcm/engine/connection_factory_impl.h"
 #include "google_apis/gcm/engine/gcm_store_impl.h"
 #include "google_apis/gcm/engine/gservices_settings.h"
 #include "google_apis/gcm/engine/mcs_client.h"
 #include "google_apis/gcm/monitoring/fake_gcm_stats_recorder.h"
 #include "net/base/host_mapping_rules.h"
@@ skipping 45 matching lines @@
 
   // Don't use initial delay unless the last request was an error.
   false,
 };
 
 // Default values used to communicate with the check-in server.
 const char kChromeVersion[] = "Chrome MCS Probe";
 
 // The default server to communicate with.
 const char kMCSServerHost[] = "mtalk.google.com";
-const uint16 kMCSServerPort = 5228;
+const uint16_t kMCSServerPort = 5228;
 
 // Command line switches.
 const char kRMQFileName[] = "rmq_file";
 const char kAndroidIdSwitch[] = "android_id";
 const char kSecretSwitch[] = "secret";
 const char kLogFileSwitch[] = "log-file";
 const char kIgnoreCertSwitch[] = "ignore-certs";
 const char kServerHostSwitch[] = "host";
 const char kServerPortSwitch[] = "port";
 
@@ skipping 11 matching lines @@
     DVLOG(1) << "  category: " << data_message.category();
     DVLOG(1) << "  sent: " << data_message.sent();
     for (int i = 0; i < data_message.app_data_size(); ++i) {
       DVLOG(1) << "  App data " << i << " "
                << data_message.app_data(i).key() << " : "
                << data_message.app_data(i).value();
     }
   }
 }
 
-void MessageSentCallback(int64 user_serial_number,
+void MessageSentCallback(int64_t user_serial_number,
                          const std::string& app_id,
                          const std::string& message_id,
                          MCSClient::MessageSendStatus status) {
   LOG(INFO) << "Message sent. Serial number: " << user_serial_number
             << " Application ID: " << app_id
             << " Message ID: " << message_id
             << " Message send status: " << status;
 }
 
 // Needed to use a real host resolver.
@@ skipping 72 matching lines @@
 
 class MCSProbe {
  public:
   MCSProbe(
       const base::CommandLine& command_line,
       scoped_refptr<net::URLRequestContextGetter> url_request_context_getter);
   ~MCSProbe();
 
   void Start();
 
-  uint64 android_id() const { return android_id_; }
-  uint64 secret() const { return secret_; }
+  uint64_t android_id() const { return android_id_; }
+  uint64_t secret() const { return secret_; }
 
  private:
   void CheckIn();
   void InitializeNetworkState();
   void BuildNetworkSession();
 
   void LoadCallback(scoped_ptr<GCMStore::LoadResult> load_result);
   void UpdateCallback(bool success);
   void ErrorCallback();
   void OnCheckInCompleted(
       const checkin_proto::AndroidCheckinResponse& checkin_response);
   void StartMCSLogin();
 
   base::DefaultClock clock_;
 
   base::CommandLine command_line_;
 
   base::FilePath gcm_store_path_;
-  uint64 android_id_;
-  uint64 secret_;
+  uint64_t android_id_;
+  uint64_t secret_;
   std::string server_host_;
   int server_port_;
 
   // Network state.
   scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
   net::NetLog net_log_;
   scoped_ptr<net::WriteToFileNetLogObserver> logger_;
   scoped_ptr<net::HostResolver> host_resolver_;
   scoped_ptr<net::CertVerifier> cert_verifier_;
   scoped_ptr<net::ChannelIDService> system_channel_id_service_;
@@ skipping 263 matching lines @@
 
   return 0;
 }
 
 }  // namespace
 }  // namespace gcm
 
 int main(int argc, char* argv[]) {
   return gcm::MCSProbeMain(argc, argv);
 }