[SyncFS] Rephrase "LowerPriority" to "Demoted" in MetadataDatabase

BUG=None Review URL: https://codereview.chromium.org/551763002 Cr-Commit-Position: refs/heads/master@{#293745}
FairyWorld · Sep 8, 2014 · 409d670 · 409d670
1 parent 0df37a7
commit 409d670
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 21 deletions.
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
@@ -217,7 +217,7 @@ class ConflictResolverTest : public testing::Test {
       status = RunRemoteToLocalSyncer();
     } while (status == SYNC_STATUS_OK ||
              status == SYNC_STATUS_RETRY ||
-             metadata_database->PromoteLowerPriorityTrackersToNormal());
+             metadata_database->PromoteDemotedTrackers());
     EXPECT_EQ(SYNC_STATUS_NO_CHANGE_TO_SYNC, status);
   }
 

diff --git a/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc b/chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer_unittest.cc
@@ -209,7 +209,7 @@ class LocalToRemoteSyncerTest : public testing::Test {
       status = RunRemoteToLocalSyncer();
     } while (status == SYNC_STATUS_OK ||
              status == SYNC_STATUS_RETRY ||
-             GetMetadataDatabase()->PromoteLowerPriorityTrackersToNormal());
+             GetMetadataDatabase()->PromoteDemotedTrackers());
     EXPECT_EQ(SYNC_STATUS_NO_CHANGE_TO_SYNC, status);
     return status;
   }

diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -1271,13 +1271,13 @@ MetadataDatabase::ActivationStatus MetadataDatabase::TryActivateTracker(
   return ACTIVATION_PENDING;
 }
 
-void MetadataDatabase::LowerTrackerPriority(int64 tracker_id) {
+void MetadataDatabase::DemoteTracker(int64 tracker_id) {
   DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
   index_->DemoteDirtyTracker(tracker_id);
   WriteToDatabase(base::Bind(&EmptyStatusCallback));
 }
 
-bool MetadataDatabase::PromoteLowerPriorityTrackersToNormal() {
+bool MetadataDatabase::PromoteDemotedTrackers() {
   DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
   bool promoted = index_->PromoteDemotedDirtyTrackers();
   WriteToDatabase(base::Bind(&EmptyStatusCallback));
@@ -1290,7 +1290,7 @@ void MetadataDatabase::PromoteDemotedTracker(int64 tracker_id) {
   WriteToDatabase(base::Bind(&EmptyStatusCallback));
 }
 
-bool MetadataDatabase::GetNormalPriorityDirtyTracker(
+bool MetadataDatabase::GetDirtyTracker(
     FileTracker* tracker_out) const {
   DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
 
@@ -1307,7 +1307,7 @@ bool MetadataDatabase::GetNormalPriorityDirtyTracker(
   return true;
 }
 
-bool MetadataDatabase::HasLowPriorityDirtyTracker() const {
+bool MetadataDatabase::HasDemotedDirtyTracker() const {
   DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
   return index_->HasDemotedDirtyTracker();
 }

diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.h b/chrome/browser/sync_file_system/drive_backend/metadata_database.h
@@ -323,17 +323,16 @@ class MetadataDatabase {
                                       const SyncStatusCallback& callback);
 
   // Changes the priority of the tracker to low.
-  void LowerTrackerPriority(int64 tracker_id);
-  bool PromoteLowerPriorityTrackersToNormal();
-
+  void DemoteTracker(int64 tracker_id);
+  bool PromoteDemotedTrackers();
   void PromoteDemotedTracker(int64 tracker_id);
 
   // Returns true if there is a normal priority dirty tracker.
   // Assigns the dirty tracker if exists and |tracker| is non-NULL.
-  bool GetNormalPriorityDirtyTracker(FileTracker* tracker) const;
+  bool GetDirtyTracker(FileTracker* tracker) const;
 
   // Returns true if there is a low priority dirty tracker.
-  bool HasLowPriorityDirtyTracker() const;
+  bool HasDemotedDirtyTracker() const;
 
   bool HasDirtyTracker() const;
   size_t CountDirtyTracker() const;

diff --git a/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc b/chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.cc
@@ -122,11 +122,10 @@ void RemoteToLocalSyncer::RunExclusive(scoped_ptr<SyncTaskToken> token) {
   }
 
   dirty_tracker_ = make_scoped_ptr(new FileTracker);
-  if (metadata_database()->GetNormalPriorityDirtyTracker(
-          dirty_tracker_.get())) {
+  if (metadata_database()->GetDirtyTracker(dirty_tracker_.get())) {
     token->RecordLog(base::StringPrintf(
         "Start: tracker_id=%" PRId64, dirty_tracker_->tracker_id()));
-    metadata_database()->LowerTrackerPriority(dirty_tracker_->tracker_id());
+    metadata_database()->DemoteTracker(dirty_tracker_->tracker_id());
     ResolveRemoteChange(token.Pass());
     return;
   }

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
@@ -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) {

diff --git a/chrome/browser/sync_file_system/drive_backend/sync_worker.cc b/chrome/browser/sync_file_system/drive_backend/sync_worker.cc
@@ -234,8 +234,8 @@ void SyncWorker::PromoteDemotedChanges(const base::Closure& callback) {
   DCHECK(sequence_checker_.CalledOnValidSequencedThread());
 
   MetadataDatabase* metadata_db = GetMetadataDatabase();
-  if (metadata_db && metadata_db->HasLowPriorityDirtyTracker()) {
-    metadata_db->PromoteLowerPriorityTrackersToNormal();
+  if (metadata_db && metadata_db->HasDemotedDirtyTracker()) {
+    metadata_db->PromoteDemotedTrackers();
     FOR_EACH_OBSERVER(
         Observer,
         observers_,