Switch to standard integer types in sync/.

sync/api/sync_merge_result.h

Index: sync/api/sync_merge_result.h
diff --git a/sync/api/sync_merge_result.h b/sync/api/sync_merge_result.h
index 712f4bd440a1308d572f44563ae036088dfb0e33..f164a4f619de0d40855952aa00b6f9bb76474938 100644
--- a/sync/api/sync_merge_result.h
+++ b/sync/api/sync_merge_result.h
@@ -5,6 +5,8 @@
 #ifndef SYNC_API_SYNC_MERGE_RESULT_H_
 #define SYNC_API_SYNC_MERGE_RESULT_H_
 
+#include <stdint.h>
+
 #include "sync/api/sync_error.h"
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ -34,7 +36,7 @@ class SYNC_EXPORT SyncMergeResult {
   void set_num_items_added(int num_items_added);
   void set_num_items_deleted(int num_items_deleted);
   void set_num_items_modified(int num_items_modified);
-  void set_pre_association_version(int64 version);
+  void set_pre_association_version(int64_t version);
 
   // Getters.
   ModelType model_type() const;
@@ -44,7 +46,7 @@ class SYNC_EXPORT SyncMergeResult {
   int num_items_added() const;
   int num_items_deleted() const;
   int num_items_modified() const;
-  int64 pre_association_version() const;
+  int64_t pre_association_version() const;
 
  private:
   // Make |this| into a copy of |other|.
@@ -70,7 +72,7 @@ class SYNC_EXPORT SyncMergeResult {
   int num_items_modified_;
 
   // Version of model before association.
-  int64 pre_association_version_;
+  int64_t pre_association_version_;
 };
 
 }  // namespace syncer