| Index: chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc
|
| index a01b05c4949fb5386a27e5c80e2abaf6a92975ce..9c5414e02fa701233770cbd7823a38299caf8183 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/metadata_database_index_on_disk_unittest.cc
|
| @@ -18,6 +18,7 @@
|
| #include "chrome/browser/sync_file_system/drive_backend/leveldb_wrapper.h"
|
| #include "chrome/browser/sync_file_system/drive_backend/metadata_database.pb.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "third_party/leveldatabase/env_chromium.h"
|
| #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"
|
| @@ -116,15 +117,15 @@ class MetadataDatabaseIndexOnDiskTest : public testing::Test {
|
| }
|
|
|
| std::unique_ptr<LevelDBWrapper> InitializeLevelDB() {
|
| - leveldb::DB* db = nullptr;
|
| + std::unique_ptr<leveldb::DB> db;
|
| leveldb::Options options;
|
| options.create_if_missing = true;
|
| options.max_open_files = 0; // Use minimum.
|
| options.env = in_memory_env_.get();
|
| - leveldb::Status status =
|
| - leveldb::DB::Open(options, database_dir_.GetPath().AsUTF8Unsafe(), &db);
|
| + leveldb::Status status = leveldb_env::OpenDB(
|
| + options, database_dir_.GetPath().AsUTF8Unsafe(), &db);
|
| EXPECT_TRUE(status.ok());
|
| - return base::MakeUnique<LevelDBWrapper>(base::WrapUnique(db));
|
| + return base::MakeUnique<LevelDBWrapper>(std::move(db));
|
| }
|
|
|
| private:
|
|
|