Chromium Code Reviews| 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); |
|
pwnall
2017/07/06 14:32:25
I expect you'll need to #include "third_party/leve
DmitrySkiba
2017/07/06 23:15:13
Actually, it's already there.
|
| 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; |
| } |