| Index: chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
|
| index d556faa7ba97e1001f9992ad512c681472271fd2..cd0878f92a035530a977d990aca401fd04ec7fae 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer_unittest.cc
|
| @@ -212,7 +212,7 @@ class RemoteToLocalSyncerTest : public testing::Test {
|
| status = RunSyncer();
|
| } while (status == SYNC_STATUS_OK ||
|
| status == SYNC_STATUS_RETRY ||
|
| - metadata_database->PromoteLowerPriorityTrackersToNormal());
|
| + metadata_database->PromoteDemotedTrackers());
|
| return status;
|
| }
|
|
|
| @@ -383,8 +383,8 @@ TEST_F(RemoteToLocalSyncerTest, Conflict_CreateFileOnFolder) {
|
| VerifyConsistency();
|
|
|
| // Tracker for the remote file should has low priority.
|
| - EXPECT_FALSE(GetMetadataDatabase()->GetNormalPriorityDirtyTracker(NULL));
|
| - EXPECT_TRUE(GetMetadataDatabase()->HasLowPriorityDirtyTracker());
|
| + EXPECT_FALSE(GetMetadataDatabase()->GetDirtyTracker(NULL));
|
| + EXPECT_TRUE(GetMetadataDatabase()->HasDemotedDirtyTracker());
|
| }
|
|
|
| TEST_F(RemoteToLocalSyncerTest, Conflict_CreateFolderOnFile) {
|
| @@ -448,8 +448,8 @@ TEST_F(RemoteToLocalSyncerTest, Conflict_CreateFileOnFile) {
|
| VerifyConsistency();
|
|
|
| // Tracker for the remote file should be lowered.
|
| - EXPECT_FALSE(GetMetadataDatabase()->GetNormalPriorityDirtyTracker(NULL));
|
| - EXPECT_TRUE(GetMetadataDatabase()->HasLowPriorityDirtyTracker());
|
| + EXPECT_FALSE(GetMetadataDatabase()->GetDirtyTracker(NULL));
|
| + EXPECT_TRUE(GetMetadataDatabase()->HasDemotedDirtyTracker());
|
| }
|
|
|
| TEST_F(RemoteToLocalSyncerTest, Conflict_CreateNestedFolderOnFile) {
|
|
|