[SyncFS] Clear dirty flag on changelist application phase

chrome/browser/sync_file_system/drive_backend/metadata_database.cc

Index: chrome/browser/sync_file_system/drive_backend/metadata_database.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
index 5c3bae8aa639b29ebb83b002a54c4fe09ab2de76..352e3fda05e374b5c479a08ba8e7f95f57c9c3c6 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -1361,6 +1361,24 @@ void MetadataDatabase::GetRegisteredAppIDs(std::vector<std::string>* app_ids) {
   *app_ids = index_->GetRegisteredAppIDs();
 }
 
+void MetadataDatabase::SweepDirtyTrackers(const SyncStatusCallback& callback) {
+  DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
+
+  std::vector<int64> tracker_ids;
+  index_->EnumerateDirtyTrackers(base::Bind(

[peria, 2014/08/07 09:40:43]

This code looks too complicated to me.
Can't we do in following style?

std::vector<int64> tracker_ids = index_->EnumerateDirtyTrackers();
VisitTrackerToSweep(tracker_ids);  // Rename?
for (size_t i = 0; ....  // #1372-

[tzik, 2014/08/12 15:14:30]

OK, revised.

+      &MetadataDatabase::VisitTrackerToSweep, base::Unretained(this),
+      &tracker_ids));
+
+  for (size_t i = 0; i < tracker_ids.size(); ++i) {
+    scoped_ptr<FileTracker> tracker(new FileTracker);
+    index_->GetFileTracker(tracker_ids[i], tracker.get());
+    tracker->set_dirty(false);
+    index_->StoreFileTracker(tracker.Pass());
+  }
+
+  WriteToDatabase(callback);
+}
+
 MetadataDatabase::MetadataDatabase(
     base::SequencedTaskRunner* worker_task_runner,
     const base::FilePath& database_path,
@@ -1882,5 +1900,42 @@ void MetadataDatabase::DetachFromSequence() {
   worker_sequence_checker_.DetachFromSequence();
 }
 
+void MetadataDatabase::VisitTrackerToSweep(std::vector<int64>* tracker_ids,
+                                           int64 tracker_id) {
+  DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
+
+  FileTracker tracker;
+  if (!index_->GetFileTracker(tracker_id, &tracker)) {
+    NOTREACHED();
+    return;
+  }
+
+  FileMetadata metadata;
+  if (!index_->GetFileMetadata(tracker.file_id(), &metadata) ||
+      !tracker.active() || !tracker.dirty() ||
+      !tracker.has_synced_details() ||
+      tracker.needs_folder_listing())
+    return;
+
+  const FileDetails& remote_details = metadata.details();
+  const FileDetails& synced_details = tracker.synced_details();
+  if (remote_details.title() != synced_details.title() ||
+      remote_details.md5() != synced_details.md5())
+    return;
+
+  std::set<std::string> parents;
+  for (int i = 0; i < remote_details.parent_folder_ids_size(); ++i)
+    parents.insert(remote_details.parent_folder_ids(i));
+
+  for (int i = 0; i < synced_details.parent_folder_ids_size(); ++i)
+    if (parents.erase(synced_details.parent_folder_ids(i)) != 1)
+      return;
+
+  if (!parents.empty())
+    return;
+
+  tracker_ids->push_back(tracker.tracker_id());
+}
+
 }  // namespace drive_backend
 }  // namespace sync_file_system