Index: chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc |
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc |
index 96c49c0c363bf1eae94e45b969fcb15a87a15f80..733797a010f35df97620bb34e99d53601162c026 100644 |
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc |
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc |
@@ -12,6 +12,7 @@ |
#include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h" |
#include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h" |
#include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h" |
+#include "chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h" |
#include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h" |
#include "chrome/browser/sync_file_system/drive_backend/metadata_database_index.h" |
#include "chrome/browser/sync_file_system/drive_backend/metadata_database_index_interface.h" |
@@ -216,7 +217,7 @@ class MetadataDatabaseTest : public testing::Test { |
void SetUpDatabaseByTrackedFiles(const TrackedFile** tracked_files, |
int size) { |
- scoped_ptr<leveldb::DB> db = InitializeLevelDB(); |
+ scoped_ptr<LevelDBWrapper> db = InitializeLevelDB(); |
ASSERT_TRUE(db); |
for (int i = 0; i < size; ++i) { |
@@ -254,7 +255,7 @@ class MetadataDatabaseTest : public testing::Test { |
MetadataDatabase* metadata_database() { return metadata_database_.get(); } |
- scoped_ptr<leveldb::DB> InitializeLevelDB() { |
+ scoped_ptr<LevelDBWrapper> InitializeLevelDB() { |
leveldb::DB* db = NULL; |
leveldb::Options options; |
options.create_if_missing = true; |
@@ -264,22 +265,21 @@ class MetadataDatabaseTest : public testing::Test { |
leveldb::DB::Open(options, database_dir_.path().AsUTF8Unsafe(), &db); |
EXPECT_TRUE(status.ok()); |
- db->Put(leveldb::WriteOptions(), |
- kDatabaseVersionKey, |
- base::Int64ToString(3)); |
- SetUpServiceMetadata(db); |
+ scoped_ptr<LevelDBWrapper> wrapper(new LevelDBWrapper(make_scoped_ptr(db))); |
- return make_scoped_ptr(db); |
+ wrapper->Put(kDatabaseVersionKey, base::Int64ToString(3)); |
+ SetUpServiceMetadata(wrapper.get()); |
+ |
+ return wrapper.Pass(); |
} |
- void SetUpServiceMetadata(leveldb::DB* db) { |
+ void SetUpServiceMetadata(LevelDBWrapper* db) { |
ServiceMetadata service_metadata; |
service_metadata.set_largest_change_id(kInitialChangeID); |
service_metadata.set_sync_root_tracker_id(kSyncRootTrackerID); |
service_metadata.set_next_tracker_id(next_tracker_id_); |
- leveldb::WriteBatch batch; |
- PutServiceMetadataToBatch(service_metadata, &batch); |
- EXPECT_TRUE(db->Write(leveldb::WriteOptions(), &batch).ok()); |
+ PutServiceMetadataToDB(service_metadata, db); |
+ EXPECT_TRUE(db->Commit().ok()); |
} |
FileMetadata CreateSyncRootMetadata() { |
@@ -451,17 +451,15 @@ class MetadataDatabaseTest : public testing::Test { |
changes->push_back(change.release()); |
} |
- leveldb::Status PutFileToDB(leveldb::DB* db, const FileMetadata& file) { |
- leveldb::WriteBatch batch; |
- PutFileMetadataToBatch(file, &batch); |
- return db->Write(leveldb::WriteOptions(), &batch); |
+ leveldb::Status PutFileToDB(LevelDBWrapper* db, const FileMetadata& file) { |
+ PutFileMetadataToDB(file, db); |
+ return db->Commit(); |
} |
- leveldb::Status PutTrackerToDB(leveldb::DB* db, |
+ leveldb::Status PutTrackerToDB(LevelDBWrapper* db, |
const FileTracker& tracker) { |
- leveldb::WriteBatch batch; |
- PutFileTrackerToBatch(tracker, &batch); |
- return db->Write(leveldb::WriteOptions(), &batch); |
+ PutFileTrackerToDB(tracker, db); |
+ return db->Commit(); |
} |
void VerifyReloadConsistency() { |
@@ -746,7 +744,7 @@ TEST_F(MetadataDatabaseTest, BuildPathTest) { |
inactive_folder_tracker.set_active(false); |
{ |
- scoped_ptr<leveldb::DB> db = InitializeLevelDB(); |
+ scoped_ptr<LevelDBWrapper> db = InitializeLevelDB(); |
ASSERT_TRUE(db); |
EXPECT_TRUE(PutFileToDB(db.get(), sync_root).ok()); |
@@ -799,7 +797,7 @@ TEST_F(MetadataDatabaseTest, FindNearestActiveAncestorTest) { |
inactive_folder_tracker.set_active(false); |
{ |
- scoped_ptr<leveldb::DB> db = InitializeLevelDB(); |
+ scoped_ptr<LevelDBWrapper> db = InitializeLevelDB(); |
ASSERT_TRUE(db); |
EXPECT_TRUE(PutFileToDB(db.get(), sync_root).ok()); |