| 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 << ": "
|
|
|