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

Failed to comile on Linux ChromiumOS: http://goo.gl/vNSg7r

> Add some DVLOG's in MetadataDatabase::Update* methods
> 
> BUG=none
> TEST=manual
> 
> Review URL: https://codereview.chromium.org/101743002

TBR=kinuko@chromium.org

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

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

chrome/browser/sync_file_system/drive_backend/metadata_database.cc

@@ -797,6 +797,35 @@ bool MetadataDatabase::FindNearestActiveAncestor(
   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,
@@ -815,7 +844,7 @@ void MetadataDatabase::UpdateByChangeList(
 
     scoped_ptr<FileMetadata> file(
         CreateFileMetadataFromChangeResource(change));
-    UpdateByFileMetadata(FROM_HERE, file.Pass(), batch.get());
+    UpdateByFileMetadata(file.Pass(), batch.get());
   }
 
   UpdateLargestKnownChangeID(largest_change_id);
@@ -832,7 +861,7 @@ void MetadataDatabase::UpdateByFileResource(
   scoped_ptr<FileMetadata> file(
       CreateFileMetadataFromFileResource(
           GetLargestKnownChangeID(), resource));
-  UpdateByFileMetadata(FROM_HERE, file.Pass(), batch.get());
+  UpdateByFileMetadata(file.Pass(), batch.get());
   WriteToDatabase(batch.Pass(), callback);
 }
 
@@ -842,7 +871,7 @@ void MetadataDatabase::UpdateByDeletedRemoteFile(
   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);
 }
 
@@ -1676,43 +1705,6 @@ bool MetadataDatabase::HasActiveTrackerForPath(int64 parent_tracker_id,
   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(

chrome/browser/sync_file_system/drive_backend/metadata_database.h

@@ -231,6 +231,9 @@ class MetadataDatabase {
                                  FileTracker* tracker,
                                  base::FilePath* path) const;
 
+  void UpdateByFileMetadata(scoped_ptr<FileMetadata> file,
+                            leveldb::WriteBatch* batch);
+
   // Updates database by |changes|.
   // Marks each tracker for modified file as dirty and adds new trackers if
   // needed.
@@ -389,10 +392,6 @@ class MetadataDatabase {
   bool HasActiveTrackerForPath(int64 parent_tracker,
                                const std::string& title) const;
 
-  void UpdateByFileMetadata(const tracked_objects::Location& from_where,
-                            scoped_ptr<FileMetadata> file,
-                            leveldb::WriteBatch* batch);
-
   void WriteToDatabase(scoped_ptr<leveldb::WriteBatch> batch,
                        const SyncStatusCallback& callback);