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

Unified Diff: chrome/browser/sync_file_system/drive_backend/metadata_database.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.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
index 85071154e45a7248fea8b40c3553547e0f5ae3f5..d7a2b2e5c643c65fa39906c68f2235f897f85578 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -222,19 +222,18 @@ SyncStatusCode OpenDatabase(const base::FilePath& path,
options.reuse_logs = leveldb_env::kDefaultLogReuseOptionValue;
if (env_override)
options.env = env_override;
- leveldb::DB* db = nullptr;
+ std::unique_ptr<leveldb::DB> db;
leveldb::Status db_status =
- leveldb::DB::Open(options, path.AsUTF8Unsafe(), &db);
+ leveldb_env::OpenDB(options, path.AsUTF8Unsafe(), &db);
UMA_HISTOGRAM_ENUMERATION("SyncFileSystem.Database.Open",
leveldb_env::GetLevelDBStatusUMAValue(db_status),
leveldb_env::LEVELDB_STATUS_MAX);
SyncStatusCode status = LevelDBStatusToSyncStatusCode(db_status);
if (status != SYNC_STATUS_OK) {
- delete db;
return status;
}
- db_out->reset(new LevelDBWrapper(base::WrapUnique(db)));
+ db_out->reset(new LevelDBWrapper(std::move(db)));
*created = IsDatabaseEmpty(db_out->get());
return status;
}

Powered by Google App Engine
This is Rietveld 408576698