[Sync] Move ChangeRecord into its own file (change_record.{h,cc})

chrome/browser/sync/profile_sync_service_preference_unittest.cc

Index: chrome/browser/sync/profile_sync_service_preference_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
index c57746221f57a8cafaf369f2e544a99bdcd6a209..67e7153610053811935cb8c7669955471a863252 100644
--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
@@ -18,9 +18,9 @@
 #include "chrome/browser/sync/glue/preference_data_type_controller.h"
 #include "chrome/browser/sync/glue/syncable_service_adapter.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
+#include "chrome/browser/sync/internal_api/change_record.h"
 #include "chrome/browser/sync/internal_api/read_node.h"
 #include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
 #include "chrome/browser/sync/internal_api/write_node.h"
 #include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
@@ -40,7 +40,7 @@ using browser_sync::GenericChangeProcessor;
 using browser_sync::PreferenceDataTypeController;
 using browser_sync::SyncBackendHost;
 using browser_sync::SyncableServiceAdapter;
-using sync_api::SyncManager;
+using sync_api::ChangeRecord;
 using testing::_;
 using testing::Invoke;
 using testing::Return;
@@ -174,12 +174,13 @@ class ProfileSyncServicePreferenceTest
     return sync_api::kInvalidId;
   }
 
-  SyncManager::ChangeRecord* MakeChangeRecord(int64 node_id,
-      SyncManager::ChangeRecord::Action action) {
-    SyncManager::ChangeRecord* record = new SyncManager::ChangeRecord();
-    record->action = action;
-    record->id = node_id;
-    return record;
+  sync_api::ImmutableChangeRecordList MakeSingletonChangeRecordList(

[Nicolas Zea, 2011/09/16 21:20:26]

Maybe pull this into test_profile_sync_service.h?

[akalin, 2011/09/16 21:50:36]

Moved into ProfileSyncServiceTestHelper in abstract_profile_sync_service_test.h

+      int64 node_id, ChangeRecord::Action action) {
+    ChangeRecord record;
+    record.action = action;
+    record.id = node_id;
+    sync_api::ChangeRecordList records(1, record);
+    return sync_api::ImmutableChangeRecordList(&records);
   }
 
   bool IsSynced(const std::string& pref_name) {
@@ -387,11 +388,11 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeActionUpdate) {
   scoped_ptr<Value> expected(Value::CreateStringValue(example_url1_));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *expected);
   ASSERT_NE(node_id, sync_api::kInvalidId);
-  scoped_ptr<SyncManager::ChangeRecord> record(MakeChangeRecord(
-      node_id, SyncManager::ChangeRecord::ACTION_UPDATE));
   {
     sync_api::WriteTransaction trans(FROM_HERE, service_->GetUserShare());
-    change_processor_->ApplyChangesFromSyncModel(&trans, record.get(), 1);
+    change_processor_->ApplyChangesFromSyncModel(
+        &trans,
+        MakeSingletonChangeRecordList(node_id, ChangeRecord::ACTION_UPDATE));
   }
   change_processor_->CommitChangesFromSyncModel();
 
@@ -407,11 +408,11 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeActionAdd) {
   scoped_ptr<Value> expected(Value::CreateStringValue(example_url0_));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *expected);
   ASSERT_NE(node_id, sync_api::kInvalidId);
-  scoped_ptr<SyncManager::ChangeRecord> record(MakeChangeRecord(
-      node_id, SyncManager::ChangeRecord::ACTION_ADD));
   {
     sync_api::WriteTransaction trans(FROM_HERE, service_->GetUserShare());
-    change_processor_->ApplyChangesFromSyncModel(&trans, record.get(), 1);
+    change_processor_->ApplyChangesFromSyncModel(
+        &trans,
+        MakeSingletonChangeRecordList(node_id, ChangeRecord::ACTION_ADD));
   }
   change_processor_->CommitChangesFromSyncModel();
 
@@ -429,11 +430,11 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeUnknownPreference) {
   scoped_ptr<Value> expected(Value::CreateStringValue(example_url0_));
   int64 node_id = SetSyncedValue("unknown preference", *expected);
   ASSERT_NE(node_id, sync_api::kInvalidId);
-  scoped_ptr<SyncManager::ChangeRecord> record(MakeChangeRecord(
-      node_id, SyncManager::ChangeRecord::ACTION_UPDATE));
   {
     sync_api::WriteTransaction trans(FROM_HERE, service_->GetUserShare());
-    change_processor_->ApplyChangesFromSyncModel(&trans, record.get(), 1);
+    change_processor_->ApplyChangesFromSyncModel(
+        &trans,
+        MakeSingletonChangeRecordList(node_id, ChangeRecord::ACTION_UPDATE));
   }
   change_processor_->CommitChangesFromSyncModel();
 
@@ -463,11 +464,11 @@ TEST_F(ProfileSyncServicePreferenceTest, ManagedPreferences) {
       Value::CreateStringValue("http://crbug.com"));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *sync_value);
   ASSERT_NE(node_id, sync_api::kInvalidId);
-  scoped_ptr<SyncManager::ChangeRecord> record(MakeChangeRecord(
-      node_id, SyncManager::ChangeRecord::ACTION_UPDATE));
   {
     sync_api::WriteTransaction trans(FROM_HERE, service_->GetUserShare());
-    change_processor_->ApplyChangesFromSyncModel(&trans, record.get(), 1);
+    change_processor_->ApplyChangesFromSyncModel(
+        &trans,
+        MakeSingletonChangeRecordList(node_id, ChangeRecord::ACTION_UPDATE));
   }
   change_processor_->CommitChangesFromSyncModel();
 
@@ -525,11 +526,11 @@ TEST_F(ProfileSyncServicePreferenceTest,
       Value::CreateStringValue("http://example.com/sync"));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *sync_value);
   ASSERT_NE(node_id, sync_api::kInvalidId);
-  scoped_ptr<SyncManager::ChangeRecord> record(MakeChangeRecord(
-      node_id, SyncManager::ChangeRecord::ACTION_ADD));
   {
     sync_api::WriteTransaction trans(FROM_HERE, service_->GetUserShare());
-    change_processor_->ApplyChangesFromSyncModel(&trans, record.get(), 1);
+    change_processor_->ApplyChangesFromSyncModel(
+        &trans,
+        MakeSingletonChangeRecordList(node_id, ChangeRecord::ACTION_ADD));
   }
   change_processor_->CommitChangesFromSyncModel();