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

Unified Diff: chrome/browser/android/history_report/usage_reports_buffer_backend.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/android/history_report/usage_reports_buffer_backend.cc
diff --git a/chrome/browser/android/history_report/usage_reports_buffer_backend.cc b/chrome/browser/android/history_report/usage_reports_buffer_backend.cc
index c8214a0567f9aa9e067dc01f79eb02fc7763f204..6a1aa49a883fd0a2fe5698a25f542144a8b6cf96 100644
--- a/chrome/browser/android/history_report/usage_reports_buffer_backend.cc
+++ b/chrome/browser/android/history_report/usage_reports_buffer_backend.cc
@@ -37,19 +37,17 @@ bool UsageReportsBufferBackend::Init() {
options.create_if_missing = true;
options.max_open_files = 0; // Use minimum number of files.
std::string path = db_file_name_.value();
- leveldb::DB* db = NULL;
- leveldb::Status status = leveldb::DB::Open(options, path, &db);
+ leveldb::Status status = leveldb_env::OpenDB(options, path, &db_);
UMA_HISTOGRAM_ENUMERATION("LevelDB.Open.UsageReportsBufferBackend",
leveldb_env::GetLevelDBStatusUMAValue(status),
leveldb_env::LEVELDB_STATUS_MAX);
if (status.IsCorruption()) {
LOG(ERROR) << "Deleting corrupt database";
base::DeleteFile(db_file_name_, true);
- status = leveldb::DB::Open(options, path, &db);
+ status = leveldb_env::OpenDB(options, path, &db_);
}
if (status.ok()) {
- CHECK(db);
- db_.reset(db);
+ CHECK(db_);
return true;
}
LOG(WARNING) << "Unable to open " << path << ": "

Powered by Google App Engine
This is Rietveld 408576698