Switch to standard integer types in sync/.

sync/engine/entity_tracker_unittest.cc

 
 // Copyright 2014 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/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"
 #include "sync/internal_api/public/non_blocking_sync_common.h"
 #include "sync/syncable/syncable_util.h"
 #include "sync/util/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer_v2 {
 
@@ skipping 14 matching lines @@
             syncer::syncable::GenerateSyncableHash(syncer::PREFERENCES,
                                                    kClientTag)),
         kCtime(base::Time::UnixEpoch() + base::TimeDelta::FromDays(10)),
         kMtime(base::Time::UnixEpoch() + base::TimeDelta::FromDays(20)) {
     specifics.mutable_preference()->set_name(kClientTag);
     specifics.mutable_preference()->set_value("pref.value");
   }
 
   ~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;
     data.creation_time = kCtime;
     data.modification_time = kMtime;
     data.specifics = specifics;
     data.non_unique_name = kClientTag;
 
     CommitRequestData request_data;
     request_data.entity = data.Pass();
     request_data.sequence_number = sequence_number;
     request_data.base_version = base_version;
     return request_data;
   }
 
-  UpdateResponseData MakeUpdateResponseData(int64 response_version) {
+  UpdateResponseData MakeUpdateResponseData(int64_t response_version) {
     EntityData data;
     data.id = kServerId;
     data.client_tag_hash = kClientTagHash;
 
     UpdateResponseData response_data;
     response_data.entity = data.Pass();
     response_data.response_version = response_version;
     return response_data;
   }
 
@@ skipping 10 matching lines @@
   scoped_ptr<EntityTracker> entity(
       EntityTracker::FromUpdateResponse(MakeUpdateResponseData(10)));
   EXPECT_FALSE(entity->HasPendingCommit());
 
   entity->ReceiveUpdate(20);
   EXPECT_FALSE(entity->HasPendingCommit());
 }
 
 // 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());
   EXPECT_EQ(kClientTagHash, pb_entity.client_defined_unique_tag());
   EXPECT_EQ(kBaseVersion, pb_entity.version());
   EXPECT_EQ(kCtime, syncer::ProtoTimeToTime(pb_entity.ctime()));
   EXPECT_EQ(kMtime, syncer::ProtoTimeToTime(pb_entity.mtime()));
   EXPECT_FALSE(pb_entity.deleted());
   EXPECT_EQ(specifics.preference().name(),
             pb_entity.specifics().preference().name());
@@ skipping 41 matching lines @@
   scoped_ptr<EntityTracker> entity(EntityTracker::FromCommitRequest(data));
   entity->RequestCommit(data);
 
   EXPECT_TRUE(entity->HasPendingCommit());
 
   entity->ReceiveUpdate(33);  // Version 33 == 33.
   EXPECT_TRUE(entity->HasPendingCommit());
 }
 
 }  // namespace syncer_v2