Switch to standard integer types in sync/.

sync/api/sync_data.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 "sync/api/sync_data.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include <ostream>
 
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "sync/internal_api/public/attachments/attachment_service_proxy.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/base_node.h"
@@ skipping 41 matching lines @@
   return *wrapper;
 }
 
 void SyncData::ImmutableSyncEntityTraits::Swap(sync_pb::SyncEntity* t1,
                                                sync_pb::SyncEntity* t2) {
   t1->Swap(t2);
 }
 
 SyncData::SyncData() : id_(kInvalidId), is_valid_(false) {}
 
-SyncData::SyncData(int64 id,
+SyncData::SyncData(int64_t id,
                    sync_pb::SyncEntity* entity,
                    const base::Time& remote_modification_time,
                    const syncer::AttachmentServiceProxy& attachment_service)
     : id_(id),
       remote_modification_time_(remote_modification_time),
       immutable_entity_(entity),
       attachment_service_(attachment_service),
       is_valid_(true) {}
 
 SyncData::~SyncData() {}
@@ skipping 31 matching lines @@
                  RepeatedFieldBackInserter(entity.mutable_attachment_id()),
                  IdToProto);
   return SyncData(kInvalidId,
                   &entity,
                   base::Time(),
                   AttachmentServiceProxy());
 }
 
 // Static.
 SyncData SyncData::CreateRemoteData(
-    int64 id,
+    int64_t id,
     const sync_pb::EntitySpecifics& specifics,
     const base::Time& modification_time,
     const AttachmentIdList& attachment_ids,
     const AttachmentServiceProxy& attachment_service) {
   DCHECK_NE(id, kInvalidId);
   sync_pb::SyncEntity entity;
   entity.mutable_specifics()->CopyFrom(specifics);
   std::transform(attachment_ids.begin(),
                  attachment_ids.end(),
                  RepeatedFieldBackInserter(entity.mutable_attachment_id()),
@@ skipping 70 matching lines @@
     : SyncData(sync_data) {
   DCHECK(!sync_data.IsLocal());
 }
 
 SyncDataRemote::~SyncDataRemote() {}
 
 const base::Time& SyncDataRemote::GetModifiedTime() const {
   return remote_modification_time_;
 }
 
-int64 SyncDataRemote::GetId() const {
+int64_t SyncDataRemote::GetId() const {
   return id_;
 }
 
 void SyncDataRemote::GetOrDownloadAttachments(
     const AttachmentIdList& attachment_ids,
     const AttachmentService::GetOrDownloadCallback& callback) {
   attachment_service_.GetOrDownloadAttachments(attachment_ids, callback);
 }
 
 }  // namespace syncer