Switch to standard integer types in sync/.

sync/tools/sync_client.cc

 // Copyright (c) 2012 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 <stdint.h>
+
 #include <cstddef>
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/debug/stack_trace.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/task_runner.h"
 #include "base/threading/thread.h"
+#include "build/build_config.h"
 #include "components/invalidation/impl/non_blocking_invalidator.h"
 #include "components/invalidation/public/object_id_invalidation_map.h"
 #include "components/sync_driver/invalidation_helper.h"
 #include "jingle/notifier/base/notification_method.h"
 #include "jingle/notifier/base/notifier_options.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/network_change_notifier.h"
 #include "net/dns/host_resolver.h"
 #include "net/http/transport_security_state.h"
 #include "net/url_request/url_request_test_util.h"
@@ skipping 91 matching lines @@
   std::string str;
   base::JSONWriter::Write(value, &str);
   return str;
 }
 
 class LoggingChangeDelegate : public SyncManager::ChangeDelegate {
  public:
   ~LoggingChangeDelegate() override {}
 
   void OnChangesApplied(ModelType model_type,
-                        int64 model_version,
+                        int64_t model_version,
                         const BaseTransaction* trans,
                         const ImmutableChangeRecordList& changes) override {
     LOG(INFO) << "Changes applied for "
               << ModelTypeToString(model_type);
     size_t i = 1;
     size_t change_count = changes.Get().size();
     for (ChangeRecordList::const_iterator it =
              changes.Get().begin(); it != changes.Get().end(); ++it) {
       scoped_ptr<base::DictionaryValue> change_value(it->ToValue());
       LOG(INFO) << "Change (" << i << "/" << change_count << "): "
@@ skipping 48 matching lines @@
   ~InvalidationAdapter() override {}
 
   bool IsUnknownVersion() const override {
     return invalidation_.is_unknown_version();
   }
 
   const std::string& GetPayload() const override {
     return invalidation_.payload();
   }
 
-  int64 GetVersion() const override { return invalidation_.version(); }
+  int64_t GetVersion() const override { return invalidation_.version(); }
 
   void Acknowledge() override { invalidation_.Acknowledge(); }
 
   void Drop() override { invalidation_.Drop(); }
 
  private:
   syncer::Invalidation invalidation_;
 };
 
 class InvalidatorShim : public InvalidationHandler {
@@ skipping 241 matching lines @@
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncClientMain(argc, argv);
 }