[SyncFileSystem][Clean up] Delete DriveMetadataDB::DeleteEntry.

[SyncFileSystem][Clean up] Delete DriveMetadataDB::DeleteEntry.

This CL deletes DriveMetadataDB::DeleteEntry as a preparation for merging DriveMetadataDB into DriveMetadataStore.

BUG=246460
TEST=DriveMetadataStoreTest.*
NOTRY=True

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=203915

[tzik, 2013-05-31 06:59:13]

PTAL.

Most/all of write-only DriveMetadataDB operation seem able to move to
DriveMetadataStore.
This will make things simple.
wdyt?

[nhiroki, 2013-06-03 02:17:35]

LGTM

[commit-bot: I haz the power, 2013-06-03 08:25:12]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tzik@chromium.org/15711009/2001

[commit-bot: I haz the power, 2013-06-03 08:25:13]

Failed to apply patch for
chrome/browser/sync_file_system/drive_metadata_store.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/sync_file_system/drive_metadata_store.cc
  Hunk #2 FAILED at 417.
  Hunk #3 succeeded at 633 (offset 32 lines).
  Hunk #4 succeeded at 946 (offset 32 lines).
  1 out of 4 hunks FAILED -- saving rejects to file
chrome/browser/sync_file_system/drive_metadata_store.cc.rej

Patch:       chrome/browser/sync_file_system/drive_metadata_store.cc
Index: chrome/browser/sync_file_system/drive_metadata_store.cc
diff --git a/chrome/browser/sync_file_system/drive_metadata_store.cc
b/chrome/browser/sync_file_system/drive_metadata_store.cc
index
5aea454551a77213faf22c20d99ec8c1702c0342..9bbebd9aa11bd3dbca1f2b1860b5adb985397950
100644
--- a/chrome/browser/sync_file_system/drive_metadata_store.cc
+++ b/chrome/browser/sync_file_system/drive_metadata_store.cc
@@ -115,7 +115,6 @@ class DriveMetadataDB {
                                         const std::string& resource_id);
   SyncStatusCode UpdateEntry(const FileSystemURL& url,
                              DriveMetadata metadata);
-  SyncStatusCode DeleteEntry(const FileSystemURL& url);
 
   // TODO(calvinlo): consolidate these state transition functions for sync
   // origins like "UpdateOrigin(GURL, SyncStatusEnum)". And manage origins in
@@ -418,12 +417,9 @@ void DriveMetadataStore::DeleteEntry(
   }
 
   if (found->second.erase(url.path()) == 1) {
-    base::PostTaskAndReplyWithResult(
-        file_task_runner_, FROM_HERE,
-        base::Bind(&DriveMetadataDB::DeleteEntry,
-                   base::Unretained(db_.get()), url),
-        base::Bind(&DriveMetadataStore::UpdateDBStatusAndInvokeCallback,
-                   AsWeakPtr(), callback));
+    scoped_ptr<leveldb::WriteBatch> batch(new leveldb::WriteBatch);
+    batch->Delete(FileSystemURLToMetadataKey(url));
+    WriteToDB(batch.Pass(), callback);
     return;
   }
 
@@ -602,6 +598,16 @@ void DriveMetadataStore::DidUpdateOrigin(
   callback.Run(status);
 }
 
+void DriveMetadataStore::WriteToDB(scoped_ptr<leveldb::WriteBatch> batch,
+                                   const SyncStatusCallback& callback) {
+  base::PostTaskAndReplyWithResult(
+      file_task_runner_, FROM_HERE,
+      base::Bind(&DriveMetadataDB::WriteToDB,
+                 base::Unretained(db_.get()), base::Owned(batch.release())),
+      base::Bind(&DriveMetadataStore::UpdateDBStatusAndInvokeCallback,
+                 AsWeakPtr(), callback));
+}
+
 void DriveMetadataStore::UpdateDBStatus(SyncStatusCode status) {
   DCHECK(CalledOnValidThread());
   if (db_status_ != SYNC_STATUS_OK &&
@@ -905,16 +911,6 @@ SyncStatusCode DriveMetadataDB::UpdateEntry(const
FileSystemURL& url,
   return WriteToDB(&batch);
 }
 
-SyncStatusCode DriveMetadataDB::DeleteEntry(const FileSystemURL& url) {
-  DCHECK(CalledOnValidThread());
-  DCHECK(db_.get());
-
-  std::string metadata_key = FileSystemURLToMetadataKey(url);
-  leveldb::WriteBatch batch;
-  batch.Delete(metadata_key);
-  return WriteToDB(&batch);
-}
-
 SyncStatusCode DriveMetadataDB::UpdateOriginAsIncrementalSync(
     const GURL& origin, const std::string& resource_id) {
   DCHECK(CalledOnValidThread());

[nhiroki, 2013-06-03 10:55:01]

To clarify why you do this (e.g. preparation for something, just refactoring,
...), can you add BUG and TEST lines?

[commit-bot: I haz the power, 2013-06-04 02:15:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tzik@chromium.org/15711009/16001

[commit-bot: I haz the power, 2013-06-04 08:38:40]

Commit queue rejected this change because the description was changed
between the time the change entered the commit queue and the time it
was ready to commit. You can safely check the commit box again.

[commit-bot: I haz the power, 2013-06-04 08:56:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/tzik@chromium.org/15711009/16001

[commit-bot: I haz the power, 2013-06-04 10:40:48]

Change committed as 203915