| Index: chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
|
| index 35d31a32b9167e89ce5c34e8437ade9dd05030f8..a48628e442fdee3b361f8dadb49b1a75f4a01030 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/register_app_task_unittest.cc
|
| @@ -17,6 +17,7 @@
|
| #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
|
| #include "chrome/browser/sync_file_system/drive_backend/drive_backend_util.h"
|
| #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h"
|
| +#include "chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h"
|
| #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
|
| #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
|
| #include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"
|
| @@ -27,7 +28,6 @@
|
| #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
|
| #include "third_party/leveldatabase/src/include/leveldb/db.h"
|
| #include "third_party/leveldatabase/src/include/leveldb/env.h"
|
| -#include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
|
|
|
| namespace sync_file_system {
|
| namespace drive_backend {
|
| @@ -78,7 +78,7 @@ class RegisterAppTaskTest : public testing::Test {
|
| }
|
|
|
| protected:
|
| - scoped_ptr<leveldb::DB> OpenLevelDB() {
|
| + scoped_ptr<LevelDBWrapper> OpenLevelDB() {
|
| leveldb::DB* db = NULL;
|
| leveldb::Options options;
|
| options.create_if_missing = true;
|
| @@ -86,10 +86,10 @@ class RegisterAppTaskTest : public testing::Test {
|
| leveldb::Status status =
|
| leveldb::DB::Open(options, database_dir_.path().AsUTF8Unsafe(), &db);
|
| EXPECT_TRUE(status.ok());
|
| - return make_scoped_ptr<leveldb::DB>(db);
|
| + return make_scoped_ptr(new LevelDBWrapper(make_scoped_ptr(db)));
|
| }
|
|
|
| - void SetUpInitialData(leveldb::DB* db) {
|
| + void SetUpInitialData(LevelDBWrapper* db) {
|
| ServiceMetadata service_metadata;
|
| service_metadata.set_largest_change_id(100);
|
| service_metadata.set_sync_root_tracker_id(kSyncRootTrackerID);
|
| @@ -112,16 +112,15 @@ class RegisterAppTaskTest : public testing::Test {
|
| *sync_root_tracker.mutable_synced_details() = sync_root_details;
|
| sync_root_tracker.set_active(true);
|
|
|
| - leveldb::WriteBatch batch;
|
| - batch.Put(kDatabaseVersionKey,
|
| - base::Int64ToString(kCurrentDatabaseVersion));
|
| - PutServiceMetadataToBatch(service_metadata, &batch);
|
| - PutFileMetadataToBatch(sync_root_metadata, &batch);
|
| - PutFileTrackerToBatch(sync_root_tracker, &batch);
|
| - EXPECT_TRUE(db->Write(leveldb::WriteOptions(), &batch).ok());
|
| + db->Put(kDatabaseVersionKey,
|
| + base::Int64ToString(kCurrentDatabaseVersion));
|
| + PutServiceMetadataToDB(service_metadata, db);
|
| + PutFileMetadataToDB(sync_root_metadata, db);
|
| + PutFileTrackerToDB(sync_root_tracker, db);
|
| + EXPECT_TRUE(db->Commit().ok());
|
| }
|
|
|
| - void CreateMetadataDatabase(scoped_ptr<leveldb::DB> db) {
|
| + void CreateMetadataDatabase(scoped_ptr<LevelDBWrapper> db) {
|
| ASSERT_TRUE(db);
|
| ASSERT_FALSE(context_->GetMetadataDatabase());
|
| scoped_ptr<MetadataDatabase> metadata_db;
|
| @@ -141,7 +140,7 @@ class RegisterAppTaskTest : public testing::Test {
|
|
|
| void SetUpRegisteredAppRoot(
|
| const std::string& app_id,
|
| - leveldb::DB* db) {
|
| + LevelDBWrapper* db) {
|
| FileDetails details;
|
| details.set_title(app_id);
|
| details.set_file_kind(FILE_KIND_FOLDER);
|
| @@ -160,14 +159,13 @@ class RegisterAppTaskTest : public testing::Test {
|
| *tracker.mutable_synced_details() = details;
|
| tracker.set_active(true);
|
|
|
| - leveldb::WriteBatch batch;
|
| - PutFileMetadataToBatch(metadata, &batch);
|
| - PutFileTrackerToBatch(tracker, &batch);
|
| - EXPECT_TRUE(db->Write(leveldb::WriteOptions(), &batch).ok());
|
| + PutFileMetadataToDB(metadata, db);
|
| + PutFileTrackerToDB(tracker, db);
|
| + EXPECT_TRUE(db->Commit().ok());
|
| }
|
|
|
| void SetUpUnregisteredAppRoot(const std::string& app_id,
|
| - leveldb::DB* db) {
|
| + LevelDBWrapper* db) {
|
| FileDetails details;
|
| details.set_title(app_id);
|
| details.set_file_kind(FILE_KIND_FOLDER);
|
| @@ -185,10 +183,9 @@ class RegisterAppTaskTest : public testing::Test {
|
| *tracker.mutable_synced_details() = details;
|
| tracker.set_active(false);
|
|
|
| - leveldb::WriteBatch batch;
|
| - PutFileMetadataToBatch(metadata, &batch);
|
| - PutFileTrackerToBatch(tracker, &batch);
|
| - EXPECT_TRUE(db->Write(leveldb::WriteOptions(), &batch).ok());
|
| + PutFileMetadataToDB(metadata, db);
|
| + PutFileTrackerToDB(tracker, db);
|
| + EXPECT_TRUE(db->Commit().ok());
|
| }
|
|
|
| size_t CountRegisteredAppRoot() {
|
| @@ -254,7 +251,7 @@ class RegisterAppTaskTest : public testing::Test {
|
| };
|
|
|
| TEST_F(RegisterAppTaskTest, AlreadyRegistered) {
|
| - scoped_ptr<leveldb::DB> db(OpenLevelDB());
|
| + scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| ASSERT_TRUE(db);
|
| SetUpInitialData(db.get());
|
|
|
| @@ -269,7 +266,7 @@ TEST_F(RegisterAppTaskTest, AlreadyRegistered) {
|
| }
|
|
|
| TEST_F(RegisterAppTaskTest, CreateAppFolder) {
|
| - scoped_ptr<leveldb::DB> db(OpenLevelDB());
|
| + scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| ASSERT_TRUE(db);
|
| SetUpInitialData(db.get());
|
|
|
| @@ -285,7 +282,7 @@ TEST_F(RegisterAppTaskTest, CreateAppFolder) {
|
| }
|
|
|
| TEST_F(RegisterAppTaskTest, RegisterExistingFolder) {
|
| - scoped_ptr<leveldb::DB> db(OpenLevelDB());
|
| + scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| ASSERT_TRUE(db);
|
| SetUpInitialData(db.get());
|
|
|
| @@ -300,7 +297,7 @@ TEST_F(RegisterAppTaskTest, RegisterExistingFolder) {
|
| }
|
|
|
| TEST_F(RegisterAppTaskTest, RegisterExistingFolder_MultipleCandidate) {
|
| - scoped_ptr<leveldb::DB> db(OpenLevelDB());
|
| + scoped_ptr<LevelDBWrapper> db = OpenLevelDB();
|
| ASSERT_TRUE(db);
|
| SetUpInitialData(db.get());
|
|
|
|
|