| 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 fd93192676dc19e529e1cb91ce099017b399ad74..1ec1b6991057630be221779fabcb1abf0809772a 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
|
| @@ -1375,6 +1375,33 @@ void MetadataDatabase::GetRegisteredAppIDs(std::vector<std::string>* app_ids) {
|
| *app_ids = index_->GetRegisteredAppIDs();
|
| }
|
|
|
| +void MetadataDatabase::SweepDirtyTrackers(
|
| + const std::vector<std::string>& file_ids,
|
| + const SyncStatusCallback& callback) {
|
| + DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
|
| +
|
| + std::set<int64> tracker_ids;
|
| + for (size_t i = 0; i < file_ids.size(); ++i) {
|
| + TrackerIDSet trackers_for_file_id =
|
| + index_->GetFileTrackerIDsByFileID(file_ids[i]);
|
| + for (TrackerIDSet::iterator itr = trackers_for_file_id.begin();
|
| + itr != trackers_for_file_id.end(); ++itr)
|
| + tracker_ids.insert(*itr);
|
| + }
|
| +
|
| + for (std::set<int64>::iterator itr = tracker_ids.begin();
|
| + itr != tracker_ids.end(); ++itr) {
|
| + scoped_ptr<FileTracker> tracker(new FileTracker);
|
| + if (!index_->GetFileTracker(*itr, tracker.get()) ||
|
| + !CanClearDirty(*tracker))
|
| + continue;
|
| + tracker->set_dirty(false);
|
| + index_->StoreFileTracker(tracker.Pass());
|
| + }
|
| +
|
| + WriteToDatabase(callback);
|
| +}
|
| +
|
| MetadataDatabase::MetadataDatabase(
|
| base::SequencedTaskRunner* worker_task_runner,
|
| const base::FilePath& database_path,
|
| @@ -1901,5 +1928,35 @@ void MetadataDatabase::DetachFromSequence() {
|
| worker_sequence_checker_.DetachFromSequence();
|
| }
|
|
|
| +bool MetadataDatabase::CanClearDirty(const FileTracker& tracker) {
|
| + DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
|
| +
|
| + FileMetadata metadata;
|
| + if (!index_->GetFileMetadata(tracker.file_id(), &metadata) ||
|
| + !tracker.active() || !tracker.dirty() ||
|
| + !tracker.has_synced_details() ||
|
| + tracker.needs_folder_listing())
|
| + return false;
|
| +
|
| + 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 false;
|
| +
|
| + 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 false;
|
| +
|
| + if (!parents.empty())
|
| + return false;
|
| +
|
| + return true;
|
| +}
|
| +
|
| } // namespace drive_backend
|
| } // namespace sync_file_system
|
|
|