| Index: extensions/browser/value_store/testing_value_store.cc
|
| diff --git a/extensions/browser/value_store/testing_value_store.cc b/extensions/browser/value_store/testing_value_store.cc
|
| index f4002de298f0ad582b7acdd7a7aa2d2b686e3681..fe863ca560a055f6f6adb98d4484ab3920e2963a 100644
|
| --- a/extensions/browser/value_store/testing_value_store.cc
|
| +++ b/extensions/browser/value_store/testing_value_store.cc
|
| @@ -49,7 +49,7 @@ ValueStore::ReadResult TestingValueStore::Get(
|
| base::DictionaryValue* settings = new base::DictionaryValue();
|
| for (std::vector<std::string>::const_iterator it = keys.begin();
|
| it != keys.end(); ++it) {
|
| - base::Value* value = NULL;
|
| + base::Value* value = nullptr;
|
| if (storage_.GetWithoutPathExpansion(*it, &value)) {
|
| settings->SetWithoutPathExpansion(*it, value->DeepCopy());
|
| }
|
| @@ -80,7 +80,7 @@ ValueStore::WriteResult TestingValueStore::Set(
|
| scoped_ptr<ValueStoreChangeList> changes(new ValueStoreChangeList());
|
| for (base::DictionaryValue::Iterator it(settings);
|
| !it.IsAtEnd(); it.Advance()) {
|
| - base::Value* old_value = NULL;
|
| + base::Value* old_value = nullptr;
|
| if (!storage_.GetWithoutPathExpansion(it.key(), &old_value) ||
|
| !old_value->Equals(&it.value())) {
|
| changes->push_back(
|
| @@ -109,7 +109,7 @@ ValueStore::WriteResult TestingValueStore::Remove(
|
| it != keys.end(); ++it) {
|
| scoped_ptr<base::Value> old_value;
|
| if (storage_.RemoveWithoutPathExpansion(*it, &old_value)) {
|
| - changes->push_back(ValueStoreChange(*it, old_value.release(), NULL));
|
| + changes->push_back(ValueStoreChange(*it, old_value.release(), nullptr));
|
| }
|
| }
|
| return MakeWriteResult(changes.Pass());
|
|
|