Switch to standard integer types in sync/.

sync/internal_api/sync_rollback_manager_unittest.cc

Index: sync/internal_api/sync_rollback_manager_unittest.cc
diff --git a/sync/internal_api/sync_rollback_manager_unittest.cc b/sync/internal_api/sync_rollback_manager_unittest.cc
index 94ce3b147acd4905f27eb89263db6e396362038e..55c5f43835b4544b3d949e7653ec337c972651b4 100644
--- a/sync/internal_api/sync_rollback_manager_unittest.cc
+++ b/sync/internal_api/sync_rollback_manager_unittest.cc
@@ -4,6 +4,9 @@
 
 #include "sync/internal_api/sync_rollback_manager.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <set>
 
 #include "base/files/scoped_temp_dir.h"
@@ -41,20 +44,18 @@ class TestChangeDelegate : public SyncManager::ChangeDelegate {
                                &TestChangeDelegate::VerifyDeletes)));
   }
 
-  void add_expected_delete(int64 v) {
-    expected_deletes_.insert(v);
-  }
+  void add_expected_delete(int64_t v) { expected_deletes_.insert(v); }
 
   MOCK_METHOD4(OnChangesApplied,
                void(ModelType model_type,
-                    int64 model_version,
+                    int64_t model_version,
                     const BaseTransaction* trans,
                     const ImmutableChangeRecordList& changes));
   MOCK_METHOD1(OnChangesComplete, void(ModelType model_type));
 
  private:
   void VerifyDeletes(const ImmutableChangeRecordList& changes) {
-    std::set<int64> deleted;
+    std::set<int64_t> deleted;
     for (size_t i = 0; i < changes.Get().size(); ++i) {
       const ChangeRecord& change = (changes.Get())[i];
       EXPECT_EQ(ChangeRecord::ACTION_DELETE, change.action);
@@ -64,7 +65,7 @@ class TestChangeDelegate : public SyncManager::ChangeDelegate {
     EXPECT_TRUE(expected_deletes_ == deleted);
   }
 
-  std::set<int64> expected_deletes_;
+  std::set<int64_t> expected_deletes_;
 };
 
 class SyncRollbackManagerTest : public testing::Test,
@@ -91,8 +92,9 @@ class SyncRollbackManagerTest : public testing::Test,
     EXPECT_TRUE(success);
   }
 
-  int64 CreateEntry(UserShare* user_share, ModelType type,
-                    const std::string& client_tag) {
+  int64_t CreateEntry(UserShare* user_share,
+                      ModelType type,
+                      const std::string& client_tag) {
     WriteTransaction trans(FROM_HERE, user_share);
     WriteNode node(&trans);
     EXPECT_EQ(WriteNode::INIT_SUCCESS,
@@ -189,7 +191,7 @@ TEST_F(SyncRollbackManagerTest, RollbackBasic) {
               InternalComponentsFactory::STORAGE_ON_DISK);
 
   // Simulate a new entry added during type initialization.
-  int64 new_pref_id =
+  int64_t new_pref_id =
       CreateEntry(rollback_manager.GetUserShare(), PREFERENCES, "pref2");
 
   delegate.add_expected_delete(new_pref_id);
@@ -213,7 +215,7 @@ TEST_F(SyncRollbackManagerTest, NoRollbackOfTypesNotBackedUp) {
               InternalComponentsFactory::STORAGE_ON_DISK);
 
   // Simulate new entry added during type initialization.
-  int64 new_pref_id =
+  int64_t new_pref_id =
       CreateEntry(rollback_manager.GetUserShare(), PREFERENCES, "pref2");
   CreateEntry(rollback_manager.GetUserShare(), APPS, "app1");