| 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 54f4e55749963d8b4ad3c3c64953d39683255999..33b43aab36d9c76ae08ff595239ee4e11ae39eb8 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
|
| @@ -32,6 +32,7 @@
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| #include "google_apis/drive/drive_api_parser.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"
|
| @@ -81,14 +82,14 @@ class RegisterAppTaskTest : public testing::Test {
|
|
|
| protected:
|
| std::unique_ptr<LevelDBWrapper> OpenLevelDB() {
|
| - leveldb::DB* db = nullptr;
|
| + std::unique_ptr<leveldb::DB> db;
|
| leveldb::Options options;
|
| options.create_if_missing = true;
|
| 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));
|
| }
|
|
|
| void SetUpInitialData(LevelDBWrapper* db) {
|
|
|