| Index: chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc b/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc
|
| index 88a57908e42a4b021edbd45c0e23bde85f843778..d5006b7bbf361e7e027ad52b203a5f9f069a439c 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/leveldb_wrapper_unittest.cc
|
| @@ -14,6 +14,7 @@
|
| #include "base/memory/ptr_util.h"
|
| #include "base/strings/string_number_conversions.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"
|
| @@ -74,16 +75,16 @@ class LevelDBWrapperTest : public testing::Test {
|
|
|
| private:
|
| void 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);
|
| ASSERT_TRUE(status.ok());
|
|
|
| - db_.reset(new LevelDBWrapper(base::WrapUnique(db)));
|
| + db_.reset(new LevelDBWrapper(std::move(db)));
|
| }
|
|
|
| base::ScopedTempDir database_dir_;
|
|
|