Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(481)

Unified Diff: chrome/browser/sync_file_system/drive_backend/metadata_database_unittest.cc

Issue 2953473002: Use leveldb_env::OpenDB() to open leveldb databases. (Closed)
Patch Set: Rebase; add comments to CHECK() Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 e0ea089755d21de1972c5c3fb239c088afbcdf80..53e4712478156942a4c594add8db3d61478d3f41 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
@@ -28,6 +28,7 @@
#include "chrome/browser/sync_file_system/sync_file_system_test_util.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"
@@ -271,17 +272,16 @@ class MetadataDatabaseTest : public testing::TestWithParam<bool> {
MetadataDatabase* metadata_database() { return metadata_database_.get(); }
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());
- std::unique_ptr<LevelDBWrapper> wrapper(
- new LevelDBWrapper(base::WrapUnique(db)));
+ std::unique_ptr<LevelDBWrapper> wrapper(new LevelDBWrapper(std::move(db)));
wrapper->Put(kDatabaseVersionKey, base::Int64ToString(3));
SetUpServiceMetadata(wrapper.get());

Powered by Google App Engine
This is Rietveld 408576698