[SyncFS] Remove a friendship between MetadataDatabase and MetadataDatabaseIndex

BUG=347425
TEST=./unit_tests --gtest_filter="MetadataDatabaseTest.*:MetadataDatabaseIndexTest.*"

Review URL: https://codereview.chromium.org/340243004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278359 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/sync_file_system/drive_backend/metadata_database.cc

@@ -719,8 +719,6 @@ void MetadataDatabase::PopulateInitialData(
     const ScopedVector<google_apis::FileResource>& app_root_folders,
     const SyncStatusCallback& callback) {
   DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
-  DCHECK(index_->tracker_by_id_.empty());
-  DCHECK(index_->metadata_by_id_.empty());
 
   scoped_ptr<leveldb::WriteBatch> batch(new leveldb::WriteBatch);
   service_metadata_->set_largest_change_id(largest_change_id);
@@ -1467,8 +1465,7 @@ bool MetadataDatabase::HasDirtyTracker() const {
 
 size_t MetadataDatabase::CountDirtyTracker() const {
   DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
-  return index_->dirty_trackers_.size() +
-      index_->demoted_dirty_trackers_.size();
+  return index_->CountDirtyTracker();
 }
 
 bool MetadataDatabase::GetMultiParentFileTrackers(std::string* file_id_out,
@@ -1494,12 +1491,12 @@ bool MetadataDatabase::GetMultiParentFileTrackers(std::string* file_id_out,
 
 size_t MetadataDatabase::CountFileMetadata() const {
   DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
-  return index_->metadata_by_id_.size();
+  return index_->CountFileMetadata();
 }
 
 size_t MetadataDatabase::CountFileTracker() const {
   DCHECK(worker_sequence_checker_.CalledOnValidSequencedThread());
-  return index_->tracker_by_id_.size();
+  return index_->CountFileTracker();
 }
 
 bool MetadataDatabase::GetConflictingTrackers(TrackerIDSet* trackers_out) {
@@ -1976,29 +1973,35 @@ scoped_ptr<base::ListValue> MetadataDatabase::DumpTrackers() {
   trackers->Append(metadata);
 
   // Append tracker data.
-  for (MetadataDatabaseIndex::TrackerByID::const_iterator itr =
-           index_->tracker_by_id_.begin();
-       itr != index_->tracker_by_id_.end(); ++itr) {
-    const FileTracker& tracker = *itr->second;
+  std::vector<int64> tracker_ids(index_->GetAllTrackerIDs());
+  for (std::vector<int64>::const_iterator itr = tracker_ids.begin();
+       itr != tracker_ids.end(); ++itr) {
+    const int64 tracker_id = *itr;
+    const FileTracker* tracker = index_->GetFileTracker(tracker_id);
+    if (!tracker) {
+      NOTREACHED();
+      continue;
+    }
+
     base::DictionaryValue* dict = new base::DictionaryValue;
-    base::FilePath path = BuildDisplayPathForTracker(tracker);
-    dict->SetString("tracker_id", base::Int64ToString(tracker.tracker_id()));
+    base::FilePath path = BuildDisplayPathForTracker(*tracker);
+    dict->SetString("tracker_id", base::Int64ToString(tracker_id));
     dict->SetString("path", path.AsUTF8Unsafe());
-    dict->SetString("file_id", tracker.file_id());
-    TrackerKind tracker_kind = tracker.tracker_kind();
+    dict->SetString("file_id", tracker->file_id());
+    TrackerKind tracker_kind = tracker->tracker_kind();
     dict->SetString(
         "tracker_kind",
         tracker_kind == TRACKER_KIND_APP_ROOT ? "AppRoot" :
         tracker_kind == TRACKER_KIND_DISABLED_APP_ROOT ? "Disabled App" :
-        tracker.tracker_id() == GetSyncRootTrackerID() ? "SyncRoot" :
+        tracker->tracker_id() == GetSyncRootTrackerID() ? "SyncRoot" :
         "Regular");
-    dict->SetString("app_id", tracker.app_id());
-    dict->SetString("active", tracker.active() ? "true" : "false");
-    dict->SetString("dirty", tracker.dirty() ? "true" : "false");
+    dict->SetString("app_id", tracker->app_id());
+    dict->SetString("active", tracker->active() ? "true" : "false");
+    dict->SetString("dirty", tracker->dirty() ? "true" : "false");
     dict->SetString("folder_listing",
-                    tracker.needs_folder_listing() ? "needed" : "no");
-    if (tracker.has_synced_details()) {
-      const FileDetails& details = tracker.synced_details();
+                    tracker->needs_folder_listing() ? "needed" : "no");
+    if (tracker->has_synced_details()) {
+      const FileDetails& details = tracker->synced_details();
       dict->SetString("title", details.title());
       dict->SetString("kind", FileKindToString(details.file_kind()));
       dict->SetString("md5", details.md5());
@@ -2031,15 +2034,20 @@ scoped_ptr<base::ListValue> MetadataDatabase::DumpMetadata() {
   files->Append(metadata);
 
   // Append metadata data.
-  for (MetadataDatabaseIndex::MetadataByID::const_iterator itr =
-           index_->metadata_by_id_.begin();
-       itr != index_->metadata_by_id_.end(); ++itr) {
-    const FileMetadata& file = *itr->second;
+  std::vector<std::string> metadata_ids(index_->GetAllMetadataIDs());
+  for (std::vector<std::string>::const_iterator itr = metadata_ids.begin();
+       itr != metadata_ids.end(); ++itr) {
+    const std::string& file_id = *itr;
+    const FileMetadata *file = index_->GetFileMetadata(file_id);
+    if (!file) {
+      NOTREACHED();
+      continue;
+    }
 
     base::DictionaryValue* dict = new base::DictionaryValue;
-    dict->SetString("file_id", file.file_id());
-    if (file.has_details()) {
-      const FileDetails& details = file.details();
+    dict->SetString("file_id", file_id);
+    if (file->has_details()) {
+      const FileDetails& details = file->details();
       dict->SetString("title", details.title());
       dict->SetString("type", FileKindToString(details.file_kind()));
       dict->SetString("md5", details.md5());

chrome/browser/sync_file_system/drive_backend/metadata_database_index.cc

@@ -210,6 +210,18 @@ void MetadataDatabaseIndex::PromoteDemotedDirtyTrackers() {
   demoted_dirty_trackers_.clear();
 }
 
+size_t MetadataDatabaseIndex::CountDirtyTracker() const {
+  return dirty_trackers_.size() + demoted_dirty_trackers_.size();
+}
+
+size_t MetadataDatabaseIndex::CountFileMetadata() const {
+  return metadata_by_id_.size();
+}
+
+size_t MetadataDatabaseIndex::CountFileTracker() const {
+  return tracker_by_id_.size();
+}
+
 std::vector<std::string> MetadataDatabaseIndex::GetRegisteredAppIDs() const {
   std::vector<std::string> result;
   result.reserve(app_root_by_app_id_.size());
@@ -219,6 +231,24 @@ std::vector<std::string> MetadataDatabaseIndex::GetRegisteredAppIDs() const {
   return result;
 }
 
+std::vector<int64> MetadataDatabaseIndex::GetAllTrackerIDs() const {
+  std::vector<int64> result;
+  for (TrackerByID::const_iterator itr = tracker_by_id_.begin();
+       itr != tracker_by_id_.end(); ++itr) {
+    result.push_back(itr->first);
+  }
+  return result;
+}
+
+std::vector<std::string> MetadataDatabaseIndex::GetAllMetadataIDs() const {
+  std::vector<std::string> result;
+  for (MetadataByID::const_iterator itr = metadata_by_id_.begin();
+       itr != metadata_by_id_.end(); ++itr) {
+    result.push_back(itr->first);
+  }
+  return result;
+}
+
 void MetadataDatabaseIndex::AddToAppIDIndex(
     const FileTracker& new_tracker) {
   if (!IsAppRoot(new_tracker))

chrome/browser/sync_file_system/drive_backend/metadata_database_index.h

@@ -118,7 +118,12 @@ class MetadataDatabaseIndex {
   // Promotes all demoted dirty trackers to normal dirty trackers.
   void PromoteDemotedDirtyTrackers();
 
+  size_t CountDirtyTracker() const;
+  size_t CountFileMetadata() const;
+  size_t CountFileTracker() const;
   std::vector<std::string> GetRegisteredAppIDs() const;
+  std::vector<int64> GetAllTrackerIDs() const;
+  std::vector<std::string> GetAllMetadataIDs() const;
 
  private:
   typedef base::ScopedPtrHashMap<std::string, FileMetadata> MetadataByID;
@@ -131,7 +136,6 @@ class MetadataDatabaseIndex {
   typedef base::hash_set<ParentIDAndTitle> PathSet;
   typedef std::set<int64> DirtyTrackers;
 
-  friend class MetadataDatabase;
   friend class MetadataDatabaseTest;
 
   // Maintains |app_root_by_app_id_|.