Switch to standard integer types in sync/.

sync/api/sync_merge_result.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 "sync/api/sync_merge_result.h"
 
 namespace syncer {
 
 SyncMergeResult::SyncMergeResult(ModelType type)
   : model_type_(type),
     num_items_before_association_(0),
     num_items_after_association_(0),
     num_items_added_(0),
     num_items_deleted_(0),
@@ skipping 25 matching lines @@
 }
 
 void SyncMergeResult::set_num_items_deleted(int num_items_deleted) {
   num_items_deleted_ = num_items_deleted;
 }
 
 void SyncMergeResult::set_num_items_modified(int num_items_modified) {
   num_items_modified_ = num_items_modified;
 }
 
-void SyncMergeResult::set_pre_association_version(int64 version) {
+void SyncMergeResult::set_pre_association_version(int64_t version) {
   pre_association_version_ = version;
 }
 
 ModelType SyncMergeResult::model_type() const {
   return model_type_;
 }
 
 SyncError SyncMergeResult::error() const {
   return error_;
 }
@@ skipping 11 matching lines @@
 }
 
 int SyncMergeResult::num_items_deleted() const {
   return num_items_deleted_;
 }
 
 int SyncMergeResult::num_items_modified() const {
   return num_items_modified_;
 }
 
-int64 SyncMergeResult::pre_association_version() const {
+int64_t SyncMergeResult::pre_association_version() const {
   return pre_association_version_;
 }
 
 }  // namespace syncer