Switch to standard integer types in sync/.

sync/api/sync_merge_result.cc

Index: sync/api/sync_merge_result.cc
diff --git a/sync/api/sync_merge_result.cc b/sync/api/sync_merge_result.cc
index 601c5777ceb9751b5d0d9486dab913f35f5c7fd2..0231acb04c5af50b29a5ed2b341ce51d4ccb3cf8 100644
--- a/sync/api/sync_merge_result.cc
+++ b/sync/api/sync_merge_result.cc
@@ -2,6 +2,8 @@
 // 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 {
@@ -47,7 +49,7 @@ 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;
 }
 
@@ -79,7 +81,7 @@ 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_;
 }