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

chrome/browser/sync_file_system/drive_metadata_store.cc

 // Copyright (c) 2012 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_metadata_store.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 97 matching lines @@
   SyncStatusCode MigrateDatabaseIfNeeded();
 
   SyncStatusCode SetLargestChangestamp(int64 largest_changestamp);
   SyncStatusCode SetSyncRootDirectory(const std::string& resource_id);
   SyncStatusCode GetSyncRootDirectory(std::string* resource_id);
   SyncStatusCode SetOriginRootDirectory(const GURL& origin,
                                         OriginSyncType sync_type,
                                         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
   // just one map like "Map<SyncStatusEnum, ResourceIDMap>".
   // http://crbug.com/211600
   SyncStatusCode UpdateOriginAsIncrementalSync(const GURL& origin,
                                                const std::string& resource_id);
   SyncStatusCode EnableOrigin(const GURL& origin,
                               const std::string& resource_id);
   SyncStatusCode DisableOrigin(const GURL& origin,
@@ skipping 296 matching lines @@
   DCHECK(CalledOnValidThread());
   MetadataMap::iterator found = metadata_map_.find(url.origin());
   if (found == metadata_map_.end()) {
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(callback, SYNC_DATABASE_ERROR_NOT_FOUND));
     return;
   }
 
   if (found->second.erase(url.path()) == 1) {
-    base::PostTaskAndReplyWithResult(
-        file_task_runner_.get(),
-        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;
   }
 
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(callback, SYNC_DATABASE_ERROR_NOT_FOUND));
 }
 
 SyncStatusCode DriveMetadataStore::ReadEntry(const FileSystemURL& url,
                                              DriveMetadata* metadata) const {
@@ skipping 174 matching lines @@
       base::Bind(&DriveMetadataStore::DidUpdateOrigin, AsWeakPtr(), callback));
 }
 
 void DriveMetadataStore::DidUpdateOrigin(
     const SyncStatusCallback& callback,
     SyncStatusCode status) {
   UpdateDBStatus(status);
   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 &&
       db_status_ != SYNC_DATABASE_ERROR_NOT_FOUND) {
     // TODO(tzik): Handle database corruption. http://crbug.com/153709
     db_status_ = status;
     util::Log(logging::LOG_WARNING,
               FROM_HERE,
               "DriveMetadataStore turned to wrong state: %s",
               SyncStatusCodeToString(status).c_str());
@@ skipping 283 matching lines @@
   std::string metadata_key = FileSystemURLToMetadataKey(url);
   std::string value;
   bool success = metadata.SerializeToString(&value);
   DCHECK(success);
 
   leveldb::WriteBatch batch;
   batch.Put(metadata_key, value);
   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());
   DCHECK(db_.get());
 
   leveldb::WriteBatch batch;
   batch.Delete(CreateKeyForOriginRoot(origin, DISABLED_ORIGIN));
   batch.Put(CreateKeyForOriginRoot(origin, INCREMENTAL_SYNC_ORIGIN),
             drive::RemoveWapiIdPrefix(resource_id));
   return WriteToDB(&batch);
@@ skipping 108 matching lines @@
 
     bool result = disabled_origins->insert(
         std::make_pair(origin, origin_resource_id)).second;
     DCHECK(result);
   }
 
   return SYNC_STATUS_OK;
 }
 
 }  // namespace sync_file_system