[SyncFS] Implement non-conflict local folder addition.

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 964 matching lines @@
 bool MetadataDatabase::GetLowPriorityDirtyTracker(
     FileTracker* tracker) const {
   DCHECK(tracker);
   DirtyTrackers::const_iterator itr = low_priority_dirty_trackers_.begin();
   if (itr == low_priority_dirty_trackers_.end())
     return false;
   *tracker = **itr;
   return true;
 }
 
+void MetadataDatabase::GetRegisteredAppIDs(std::vector<std::string>* app_ids) {
+  DCHECK(app_ids);
+  app_ids->clear();
+  app_ids->reserve(app_root_by_app_id_.size());
+  for (TrackerByAppID::iterator itr = app_root_by_app_id_.begin();
+       itr != app_root_by_app_id_.end(); ++itr) {
+    app_ids->push_back(itr->first);
+  }
+}
+
+void MetadataDatabase::MarkTrackerDirty(int64 tracker_id,
+                                        const SyncStatusCallback& callback) {
+  TrackerByID::iterator found = tracker_by_id_.find(tracker_id);
+  if (found == tracker_by_id_.end()) {
+    RunSoon(FROM_HERE, base::Bind(callback, SYNC_STATUS_OK));
+    return;
+  }
+
+  scoped_ptr<leveldb::WriteBatch> batch(new leveldb::WriteBatch);
+  MarkSingleTrackerDirty(found->second, batch.get());
+  WriteToDatabase(batch.Pass(), callback);
+}
+
 MetadataDatabase::MetadataDatabase(base::SequencedTaskRunner* task_runner)
     : task_runner_(task_runner),
       largest_known_change_id_(0),
       weak_ptr_factory_(this) {
   DCHECK(task_runner);
 }
 
 // static
 void MetadataDatabase::CreateOnTaskRunner(
     base::SingleThreadTaskRunner* callback_runner,
@@ skipping 374 matching lines @@
   TrackerSet* conflicting_trackers = &found_by_title->second;
   conflicting_trackers->Erase(tracker);
 
   if (conflicting_trackers->tracker_set().empty()) {
     trackers_by_title->erase(found_by_title);
     if (trackers_by_title->empty())
       trackers_by_parent_and_title_.erase(found);
   }
 }
 
+void MetadataDatabase::MarkSingleTrackerDirty(FileTracker* tracker,
+                                              leveldb::WriteBatch* batch) {
+  if (!tracker->dirty()) {
+    tracker->set_dirty(true);
+    PutTrackerToBatch(*tracker, batch);
+  }
+  dirty_trackers_.insert(tracker);
+  low_priority_dirty_trackers_.erase(tracker);
+}
+
 void MetadataDatabase::MarkTrackerSetDirty(
     TrackerSet* trackers,
     leveldb::WriteBatch* batch) {
   for (TrackerSet::iterator itr = trackers->begin();
        itr != trackers->end(); ++itr) {
-    FileTracker* tracker = *itr;
-    if (tracker->dirty())
-      continue;
-    tracker->set_dirty(true);
-    PutTrackerToBatch(*tracker, batch);
-    dirty_trackers_.insert(tracker);
-    low_priority_dirty_trackers_.erase(tracker);
+    MarkSingleTrackerDirty(*itr, batch);
   }
 }
 
 void MetadataDatabase::MarkTrackersDirtyByFileID(
     const std::string& file_id,
     leveldb::WriteBatch* batch) {
   TrackersByFileID::iterator found = trackers_by_file_id_.find(file_id);
   if (found != trackers_by_file_id_.end())
     MarkTrackerSetDirty(&found->second, batch);
 }
@@ skipping 179 matching lines @@
     details->SetString("dirty", tracker->dirty() ? "true" : "false");
 
     file->Set("details", details);
 
     files->Append(file);
   }
 
   return files.Pass();
 }
 
-void MetadataDatabase::GetRegisteredAppIDs(std::vector<std::string>* app_ids) {
-  DCHECK(app_ids);
-  app_ids->clear();
-  app_ids->reserve(app_root_by_app_id_.size());
-  for (TrackerByAppID::iterator itr = app_root_by_app_id_.begin();
-       itr != app_root_by_app_id_.end(); ++itr) {
-    app_ids->push_back(itr->first);
-  }
-}
-
 bool MetadataDatabase::HasNewerFileMetadata(const std::string& file_id,
                                             int64 change_id) {
   FileByID::const_iterator found = file_by_id_.find(file_id);
   if (found == file_by_id_.end())
     return false;
   DCHECK(found->second->has_details());
   return found->second->details().change_id() >= change_id;
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system