Revert 238395 "Add some DVLOG's in MetadataDatabase::Update* met..."

trunk/src/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 779 matching lines @@
       return true;
     }
 
     *tracker = *trackers.active_tracker();
     *path = path->Append(components[i]);
   }
 
   return true;
 }
 
+void MetadataDatabase::UpdateByFileMetadata(scoped_ptr<FileMetadata> file,
+                                            leveldb::WriteBatch* batch) {
+  DCHECK(file);
+  DCHECK(file->has_details());
+  std::string file_id = file->file_id();
+  if (file->details().missing()) {
+    TrackerSet trackers;
+    FindTrackersByFileID(file_id, &trackers);
+    for (TrackerSet::const_iterator itr = trackers.begin();
+         itr != trackers.end(); ++itr) {
+      const FileTracker& tracker = **itr;
+      if (!tracker.has_synced_details() ||
+          tracker.synced_details().missing()) {
+        RemoveTracker(tracker.tracker_id(), batch);
+      }
+    }
+  } else {
+    MaybeAddTrackersForNewFile(*file, batch);
+  }
+
+  if (FindTrackersByFileID(file_id, NULL)) {
+    MarkTrackersDirtyByFileID(file_id, batch);
+    PutFileToBatch(*file, batch);
+    FileMetadata* file_ptr = file.release();
+    std::swap(file_ptr, file_by_id_[file_id]);
+    delete file_ptr;
+  }
+}
+
 void MetadataDatabase::UpdateByChangeList(
     int64 largest_change_id,
     ScopedVector<google_apis::ChangeResource> changes,
     const SyncStatusCallback& callback) {
   DCHECK_LE(service_metadata_->largest_change_id(), largest_change_id);
 
   scoped_ptr<leveldb::WriteBatch> batch(new leveldb::WriteBatch);
 
   for (ScopedVector<google_apis::ChangeResource>::const_iterator itr =
            changes.begin();
        itr != changes.end();
        ++itr) {
     const google_apis::ChangeResource& change = **itr;
     if (HasNewerFileMetadata(change.file_id(), change.change_id()))
       continue;
 
     scoped_ptr<FileMetadata> file(
         CreateFileMetadataFromChangeResource(change));
-    UpdateByFileMetadata(FROM_HERE, file.Pass(), batch.get());
+    UpdateByFileMetadata(file.Pass(), batch.get());
   }
 
   UpdateLargestKnownChangeID(largest_change_id);
   service_metadata_->set_largest_change_id(largest_change_id);
   PutServiceMetadataToBatch(*service_metadata_, batch.get());
   WriteToDatabase(batch.Pass(), callback);
 }
 
 void MetadataDatabase::UpdateByFileResource(
     const google_apis::FileResource& resource,
     const SyncStatusCallback& callback) {
   scoped_ptr<leveldb::WriteBatch> batch(new leveldb::WriteBatch);
 
   scoped_ptr<FileMetadata> file(
       CreateFileMetadataFromFileResource(
           GetLargestKnownChangeID(), resource));
-  UpdateByFileMetadata(FROM_HERE, file.Pass(), batch.get());
+  UpdateByFileMetadata(file.Pass(), batch.get());
   WriteToDatabase(batch.Pass(), callback);
 }
 
 void MetadataDatabase::UpdateByDeletedRemoteFile(
     const std::string& file_id,
     const SyncStatusCallback& callback) {
   scoped_ptr<leveldb::WriteBatch> batch(new leveldb::WriteBatch);
   scoped_ptr<FileMetadata> file(
       CreateDeletedFileMetadata(GetLargestKnownChangeID(), file_id));
-  UpdateByFileMetadata(FROM_HERE, file.Pass(), batch.get());
+  UpdateByFileMetadata(file.Pass(), batch.get());
   WriteToDatabase(batch.Pass(), callback);
 }
 
 void MetadataDatabase::ReplaceActiveTrackerWithNewResource(
     int64 parent_tracker_id,
     const google_apis::FileResource& resource,
     const SyncStatusCallback& callback) {
   scoped_ptr<leveldb::WriteBatch> batch(new leveldb::WriteBatch);
 
   scoped_ptr<FileMetadata> file(
@@ skipping 813 matching lines @@
   TrackersByParentAndTitle::const_iterator found_by_parent =
       trackers_by_parent_and_title_.find(parent_tracker_id);
   if (found_by_parent == trackers_by_parent_and_title_.end())
     return false;
 
   const TrackersByTitle& trackers_by_title = found_by_parent->second;
   TrackersByTitle::const_iterator found = trackers_by_title.find(title);
   return found != trackers_by_title.end() && found->second.has_active();
 }
 
-void MetadataDatabase::UpdateByFileMetadata(
-    const tracked_objects::Location& from_where,
-    scoped_ptr<FileMetadata> file,
-    leveldb::WriteBatch* batch) {
-  DCHECK(file);
-  DCHECK(file->has_details());
-
-  DVLOG(1) << from_where.function_name() << ": "
-           << file->file_id() << " ("
-           << file->details().title() << ")"
-           << (file->details().missing() ? " deleted" : "");
-
-  std::string file_id = file->file_id();
-  if (file->details().missing()) {
-    TrackerSet trackers;
-    FindTrackersByFileID(file_id, &trackers);
-    for (TrackerSet::const_iterator itr = trackers.begin();
-         itr != trackers.end(); ++itr) {
-      const FileTracker& tracker = **itr;
-      if (!tracker.has_synced_details() ||
-          tracker.synced_details().missing()) {
-        RemoveTracker(tracker.tracker_id(), batch);
-      }
-    }
-  } else {
-    MaybeAddTrackersForNewFile(*file, batch);
-  }
-
-  if (FindTrackersByFileID(file_id, NULL)) {
-    MarkTrackersDirtyByFileID(file_id, batch);
-    PutFileToBatch(*file, batch);
-    FileMetadata* file_ptr = file.release();
-    std::swap(file_ptr, file_by_id_[file_id]);
-    delete file_ptr;
-  }
-}
-
 void MetadataDatabase::WriteToDatabase(scoped_ptr<leveldb::WriteBatch> batch,
                                        const SyncStatusCallback& callback) {
   base::PostTaskAndReplyWithResult(
       task_runner_.get(),
       FROM_HERE,
       base::Bind(&leveldb::DB::Write,
                  base::Unretained(db_.get()),
                  leveldb::WriteOptions(),
                  base::Owned(batch.release())),
       base::Bind(&AdaptLevelDBStatusToSyncStatusCode, callback));
@@ skipping 60 matching lines @@
                                             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