Switch to standard integer types in sync/.

sync/engine/entity_tracker_unittest.cc

Index: sync/engine/entity_tracker_unittest.cc
diff --git a/sync/engine/entity_tracker_unittest.cc b/sync/engine/entity_tracker_unittest.cc
index 5dd2d38126e7d5aa785c8921acca0a85de37f450..2589448060908fe90c532cbdc0b8f7f6e6b9bfa2 100644
--- a/sync/engine/entity_tracker_unittest.cc
+++ b/sync/engine/entity_tracker_unittest.cc
@@ -5,6 +5,8 @@
 
 #include "sync/engine/entity_tracker.h"
 
+#include <stdint.h>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "sync/internal_api/public/base/model_type.h"
@@ -39,8 +41,8 @@ class EntityTrackerTest : public ::testing::Test {
 
   ~EntityTrackerTest() override {}
 
-  CommitRequestData MakeCommitRequestData(int64 sequence_number,
-                                          int64 base_version) {
+  CommitRequestData MakeCommitRequestData(int64_t sequence_number,
+                                          int64_t base_version) {
     EntityData data;
     data.id = kServerId;
     data.client_tag_hash = kClientTagHash;
@@ -56,7 +58,7 @@ class EntityTrackerTest : public ::testing::Test {
     return request_data;
   }
 
-  UpdateResponseData MakeUpdateResponseData(int64 response_version) {
+  UpdateResponseData MakeUpdateResponseData(int64_t response_version) {
     EntityData data;
     data.id = kServerId;
     data.client_tag_hash = kClientTagHash;
@@ -87,15 +89,15 @@ TEST_F(EntityTrackerTest, FromUpdateResponse) {
 
 // Construct a new entity from a commit request.  Then serialize it.
 TEST_F(EntityTrackerTest, FromCommitRequest) {
-  const int64 kSequenceNumber = 22;
-  const int64 kBaseVersion = 33;
+  const int64_t kSequenceNumber = 22;
+  const int64_t kBaseVersion = 33;
   CommitRequestData data = MakeCommitRequestData(kSequenceNumber, kBaseVersion);
   scoped_ptr<EntityTracker> entity(EntityTracker::FromCommitRequest(data));
   entity->RequestCommit(data);
 
   ASSERT_TRUE(entity->HasPendingCommit());
   sync_pb::SyncEntity pb_entity;
-  int64 sequence_number = 0;
+  int64_t sequence_number = 0;
   entity->PrepareCommitProto(&pb_entity, &sequence_number);
   EXPECT_EQ(kSequenceNumber, sequence_number);
   EXPECT_EQ(kServerId, pb_entity.id_string());