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

Unified Diff: extensions/browser/value_store/leveldb_value_store.cc

Issue 1909773002: Convert //extensions/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 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: extensions/browser/value_store/leveldb_value_store.cc
diff --git a/extensions/browser/value_store/leveldb_value_store.cc b/extensions/browser/value_store/leveldb_value_store.cc
index a65aa8b85b90690796d14a09461a2e1246ea5658..8ab753e4c8c784c697a4d4d25fe8cbe150245713 100644
--- a/extensions/browser/value_store/leveldb_value_store.cc
+++ b/extensions/browser/value_store/leveldb_value_store.cc
@@ -79,10 +79,10 @@ ValueStore::ReadResult LeveldbValueStore::Get(
if (!status.ok())
return MakeReadResult(status);
- scoped_ptr<base::DictionaryValue> settings(new base::DictionaryValue());
+ std::unique_ptr<base::DictionaryValue> settings(new base::DictionaryValue());
for (const std::string& key : keys) {
- scoped_ptr<base::Value> setting;
+ std::unique_ptr<base::Value> setting;
status.Merge(Read(key, &setting));
if (!status.ok())
return MakeReadResult(status);
@@ -101,12 +101,12 @@ ValueStore::ReadResult LeveldbValueStore::Get() {
return MakeReadResult(status);
base::JSONReader json_reader;
- scoped_ptr<base::DictionaryValue> settings(new base::DictionaryValue());
+ std::unique_ptr<base::DictionaryValue> settings(new base::DictionaryValue());
- scoped_ptr<leveldb::Iterator> it(db()->NewIterator(read_options()));
+ std::unique_ptr<leveldb::Iterator> it(db()->NewIterator(read_options()));
for (it->SeekToFirst(); it->Valid(); it->Next()) {
std::string key = it->key().ToString();
- scoped_ptr<base::Value> value =
+ std::unique_ptr<base::Value> value =
json_reader.Read(StringPiece(it->value().data(), it->value().size()));
if (!value) {
return MakeReadResult(
@@ -135,7 +135,7 @@ ValueStore::WriteResult LeveldbValueStore::Set(WriteOptions options,
return MakeWriteResult(status);
leveldb::WriteBatch batch;
- scoped_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
+ std::unique_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
status.Merge(AddToBatch(options, key, value, &batch, changes.get()));
if (!status.ok())
return MakeWriteResult(status);
@@ -155,7 +155,7 @@ ValueStore::WriteResult LeveldbValueStore::Set(
return MakeWriteResult(status);
leveldb::WriteBatch batch;
- scoped_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
+ std::unique_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
for (base::DictionaryValue::Iterator it(settings);
!it.IsAtEnd(); it.Advance()) {
@@ -184,10 +184,10 @@ ValueStore::WriteResult LeveldbValueStore::Remove(
return MakeWriteResult(status);
leveldb::WriteBatch batch;
- scoped_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
+ std::unique_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
for (const std::string& key : keys) {
- scoped_ptr<base::Value> old_value;
+ std::unique_ptr<base::Value> old_value;
status.Merge(Read(key, &old_value));
if (!status.ok())
return MakeWriteResult(status);
@@ -209,7 +209,7 @@ ValueStore::WriteResult LeveldbValueStore::Remove(
ValueStore::WriteResult LeveldbValueStore::Clear() {
DCHECK_CURRENTLY_ON(BrowserThread::FILE);
- scoped_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
+ std::unique_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
ReadResult read_result = Get();
if (!read_result->status().ok())
@@ -218,7 +218,7 @@ ValueStore::WriteResult LeveldbValueStore::Clear() {
base::DictionaryValue& whole_db = read_result->settings();
while (!whole_db.empty()) {
std::string next_key = base::DictionaryValue::Iterator(whole_db).key();
- scoped_ptr<base::Value> next_value;
+ std::unique_ptr<base::Value> next_value;
whole_db.RemoveWithoutPathExpansion(next_key, &next_value);
changes->push_back(ValueStoreChange(next_key, next_value.release(), NULL));
}
@@ -274,7 +274,7 @@ ValueStore::Status LeveldbValueStore::AddToBatch(
bool write_new_value = true;
if (!(options & NO_GENERATE_CHANGES)) {
- scoped_ptr<base::Value> old_value;
+ std::unique_ptr<base::Value> old_value;
Status status = Read(key, &old_value);
if (!status.ok())
return status;
« no previous file with comments | « extensions/browser/value_store/leveldb_value_store.h ('k') | extensions/browser/value_store/leveldb_value_store_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698