| Index: chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
|
| diff --git a/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc b/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
|
| index 3be8686c0a003b4c5c5f3d3c3343727967959117..b4f99efdfc5df50187ed901cd1416fa4eed64a89 100644
|
| --- a/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
|
| +++ b/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
|
| @@ -290,7 +290,7 @@ TEST_F(JsSyncManagerObserverTest, OnChangesApplied) {
|
| // We don't test with passwords as that requires additional setup.
|
|
|
| // Build a list of example ChangeRecords.
|
| - sync_api::SyncManager::ChangeRecord changes[syncable::MODEL_TYPE_COUNT];
|
| + sync_api::ChangeRecord changes[syncable::MODEL_TYPE_COUNT];
|
| for (int i = syncable::AUTOFILL_PROFILE;
|
| i < syncable::MODEL_TYPE_COUNT; ++i) {
|
| changes[i].id =
|
| @@ -298,15 +298,15 @@ TEST_F(JsSyncManagerObserverTest, OnChangesApplied) {
|
| switch (i % 3) {
|
| case 0:
|
| changes[i].action =
|
| - sync_api::SyncManager::ChangeRecord::ACTION_ADD;
|
| + sync_api::ChangeRecord::ACTION_ADD;
|
| break;
|
| case 1:
|
| changes[i].action =
|
| - sync_api::SyncManager::ChangeRecord::ACTION_UPDATE;
|
| + sync_api::ChangeRecord::ACTION_UPDATE;
|
| break;
|
| default:
|
| changes[i].action =
|
| - sync_api::SyncManager::ChangeRecord::ACTION_DELETE;
|
| + sync_api::ChangeRecord::ACTION_DELETE;
|
| break;
|
| }
|
| {
|
| @@ -343,9 +343,12 @@ TEST_F(JsSyncManagerObserverTest, OnChangesApplied) {
|
| for (int i = syncable::AUTOFILL_PROFILE;
|
| i < syncable::MODEL_TYPE_COUNT; ++i) {
|
| sync_api::ReadTransaction trans(FROM_HERE, test_user_share.user_share());
|
| - js_sync_manager_observer_.OnChangesApplied(syncable::ModelTypeFromInt(i),
|
| - &trans, &changes[i],
|
| - syncable::MODEL_TYPE_COUNT - i);
|
| + sync_api::ChangeRecordList
|
| + local_changes(changes + i, changes + arraysize(changes));
|
| + js_sync_manager_observer_.OnChangesApplied(
|
| + syncable::ModelTypeFromInt(i),
|
| + &trans,
|
| + sync_api::ImmutableChangeRecordList(&local_changes));
|
| }
|
|
|
| test_user_share.TearDown();
|
|
|