[SyncFS] Clear dirty flag on changelist application phase

chrome/browser/sync_file_system/drive_backend/metadata_database.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
 
 #include <algorithm>
 #include <stack>
 
 #include "base/bind.h"
@@ skipping 1343 matching lines @@
   std::swap(*trackers_out, trackers);
   return true;
 }
 
 void MetadataDatabase::GetRegisteredAppIDs(std::vector<std::string>* app_ids) {
   DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
   DCHECK(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,
     leveldb::Env* env_override)
     : worker_task_runner_(worker_task_runner),
       database_path_(database_path),
       env_override_(env_override),
       largest_known_change_id_(0),
       weak_ptr_factory_(this) {
   DCHECK(worker_task_runner);
@@ skipping 501 matching lines @@
                                   *app_root_metadata);
 
   index_->StoreFileMetadata(app_root_metadata.Pass());
   index_->StoreFileTracker(app_root_tracker.Pass());
 }
 
 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