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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« extensions/browser/api/bluetooth/bluetooth_apitest.cc ('K') | « extensions/browser/value_store/value_store_frontend.cc ('k') | extensions/browser/verified_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/value_store/value_store_unittest.cc
diff --git a/extensions/browser/value_store/value_store_unittest.cc b/extensions/browser/value_store/value_store_unittest.cc
index 4293459aa6752989ef5aaa534373a4c04561a5f5..bebb26da475b60c5f18dbd2343445c6ddd6db276 100644
--- a/extensions/browser/value_store/value_store_unittest.cc
+++ b/extensions/browser/value_store/value_store_unittest.cc
@@ -188,7 +188,7 @@ TEST_P(ValueStoreTest, GetWhenEmpty) {
TEST_P(ValueStoreTest, GetWithSingleValue) {
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key1_, NULL, val1_->DeepCopy()));
+ changes.push_back(ValueStoreChange(key1_, nullptr, val1_->DeepCopy()));
EXPECT_PRED_FORMAT2(ChangesEq,
changes, storage_->Set(DEFAULTS, key1_, *val1_));
}
@@ -204,8 +204,8 @@ TEST_P(ValueStoreTest, GetWithSingleValue) {
TEST_P(ValueStoreTest, GetWithMultipleValues) {
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key1_, NULL, val1_->DeepCopy()));
- changes.push_back(ValueStoreChange(key2_, NULL, val2_->DeepCopy()));
+ changes.push_back(ValueStoreChange(key1_, nullptr, val1_->DeepCopy()));
+ changes.push_back(ValueStoreChange(key2_, nullptr, val2_->DeepCopy()));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, *dict12_));
}
@@ -229,7 +229,7 @@ TEST_P(ValueStoreTest, RemoveWithSingleValue) {
storage_->Set(DEFAULTS, *dict1_);
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key1_, val1_->DeepCopy(), NULL));
+ changes.push_back(ValueStoreChange(key1_, val1_->DeepCopy(), nullptr));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(key1_));
}
@@ -244,7 +244,7 @@ TEST_P(ValueStoreTest, RemoveWithMultipleValues) {
storage_->Set(DEFAULTS, *dict123_);
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key3_, val3_->DeepCopy(), NULL));
+ changes.push_back(ValueStoreChange(key3_, val3_->DeepCopy(), nullptr));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(key3_));
}
@@ -259,8 +259,8 @@ TEST_P(ValueStoreTest, RemoveWithMultipleValues) {
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key1_, val1_->DeepCopy(), NULL));
- changes.push_back(ValueStoreChange(key2_, val2_->DeepCopy(), NULL));
+ changes.push_back(ValueStoreChange(key1_, val1_->DeepCopy(), nullptr));
+ changes.push_back(ValueStoreChange(key2_, val2_->DeepCopy(), nullptr));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(list12_));
}
@@ -280,7 +280,7 @@ TEST_P(ValueStoreTest, SetWhenOverwriting) {
ValueStoreChangeList changes;
changes.push_back(
ValueStoreChange(key1_, val2_->DeepCopy(), val1_->DeepCopy()));
- changes.push_back(ValueStoreChange(key2_, NULL, val2_->DeepCopy()));
+ changes.push_back(ValueStoreChange(key2_, nullptr, val2_->DeepCopy()));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, *dict12_));
}
@@ -307,8 +307,8 @@ TEST_P(ValueStoreTest, ClearWhenNotEmpty) {
storage_->Set(DEFAULTS, *dict12_);
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key1_, val1_->DeepCopy(), NULL));
- changes.push_back(ValueStoreChange(key2_, val2_->DeepCopy(), NULL));
+ changes.push_back(ValueStoreChange(key1_, val1_->DeepCopy(), nullptr));
+ changes.push_back(ValueStoreChange(key2_, val2_->DeepCopy(), nullptr));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear());
}
@@ -332,8 +332,7 @@ TEST_P(ValueStoreTest, DotsInKeyNames) {
{
ValueStoreChangeList changes;
- changes.push_back(
- ValueStoreChange(dot_key, NULL, dot_value.DeepCopy()));
+ changes.push_back(ValueStoreChange(dot_key, nullptr, dot_value.DeepCopy()));
EXPECT_PRED_FORMAT2(ChangesEq,
changes, storage_->Set(DEFAULTS, dot_key, dot_value));
}
@@ -344,16 +343,14 @@ TEST_P(ValueStoreTest, DotsInKeyNames) {
{
ValueStoreChangeList changes;
- changes.push_back(
- ValueStoreChange(dot_key, dot_value.DeepCopy(), NULL));
+ changes.push_back(ValueStoreChange(dot_key, dot_value.DeepCopy(), nullptr));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(dot_key));
}
EXPECT_PRED_FORMAT2(ChangesEq,
ValueStoreChangeList(), storage_->Remove(dot_key));
{
ValueStoreChangeList changes;
- changes.push_back(
- ValueStoreChange(dot_key, NULL, dot_value.DeepCopy()));
+ changes.push_back(ValueStoreChange(dot_key, nullptr, dot_value.DeepCopy()));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, dot_dict));
}
@@ -362,8 +359,7 @@ TEST_P(ValueStoreTest, DotsInKeyNames) {
{
ValueStoreChangeList changes;
- changes.push_back(
- ValueStoreChange(dot_key, dot_value.DeepCopy(), NULL));
+ changes.push_back(ValueStoreChange(dot_key, dot_value.DeepCopy(), nullptr));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(dot_list));
}
@@ -379,8 +375,7 @@ TEST_P(ValueStoreTest, DotsInKeyNamesWithDicts) {
{
ValueStoreChangeList changes;
- changes.push_back(
- ValueStoreChange("foo", NULL, inner_dict->DeepCopy()));
+ changes.push_back(ValueStoreChange("foo", nullptr, inner_dict->DeepCopy()));
EXPECT_PRED_FORMAT2(ChangesEq,
changes, storage_->Set(DEFAULTS, outer_dict));
}
@@ -409,35 +404,35 @@ TEST_P(ValueStoreTest, ComplexChangedKeysScenarios) {
}
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key1_, val2_->DeepCopy(), NULL));
+ changes.push_back(ValueStoreChange(key1_, val2_->DeepCopy(), nullptr));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(key1_));
EXPECT_PRED_FORMAT2(ChangesEq,
ValueStoreChangeList(), storage_->Remove(key1_));
}
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key1_, NULL, val1_->DeepCopy()));
+ changes.push_back(ValueStoreChange(key1_, nullptr, val1_->DeepCopy()));
EXPECT_PRED_FORMAT2(ChangesEq,
changes, storage_->Set(DEFAULTS, key1_, *val1_));
}
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key1_, val1_->DeepCopy(), NULL));
+ changes.push_back(ValueStoreChange(key1_, val1_->DeepCopy(), nullptr));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear());
EXPECT_PRED_FORMAT2(ChangesEq, ValueStoreChangeList(), storage_->Clear());
}
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key1_, NULL, val1_->DeepCopy()));
- changes.push_back(ValueStoreChange(key2_, NULL, val2_->DeepCopy()));
+ changes.push_back(ValueStoreChange(key1_, nullptr, val1_->DeepCopy()));
+ changes.push_back(ValueStoreChange(key2_, nullptr, val2_->DeepCopy()));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, *dict12_));
EXPECT_PRED_FORMAT2(ChangesEq,
ValueStoreChangeList(), storage_->Set(DEFAULTS, *dict12_));
}
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key3_, NULL, val3_->DeepCopy()));
+ changes.push_back(ValueStoreChange(key3_, nullptr, val3_->DeepCopy()));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, *dict123_));
}
{
@@ -450,15 +445,14 @@ TEST_P(ValueStoreTest, ComplexChangedKeysScenarios) {
ValueStoreChangeList changes;
changes.push_back(
ValueStoreChange(key1_, val1_->DeepCopy(), val2_->DeepCopy()));
- changes.push_back(ValueStoreChange("asdf", NULL, val1_->DeepCopy()));
- changes.push_back(
- ValueStoreChange("qwerty", NULL, val3_->DeepCopy()));
+ changes.push_back(ValueStoreChange("asdf", nullptr, val1_->DeepCopy()));
+ changes.push_back(ValueStoreChange("qwerty", nullptr, val3_->DeepCopy()));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Set(DEFAULTS, to_set));
}
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key1_, val2_->DeepCopy(), NULL));
- changes.push_back(ValueStoreChange(key2_, val2_->DeepCopy(), NULL));
+ changes.push_back(ValueStoreChange(key1_, val2_->DeepCopy(), nullptr));
+ changes.push_back(ValueStoreChange(key2_, val2_->DeepCopy(), nullptr));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(list12_));
}
{
@@ -467,14 +461,13 @@ TEST_P(ValueStoreTest, ComplexChangedKeysScenarios) {
to_remove.push_back("asdf");
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange("asdf", val1_->DeepCopy(), NULL));
+ changes.push_back(ValueStoreChange("asdf", val1_->DeepCopy(), nullptr));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Remove(to_remove));
}
{
ValueStoreChangeList changes;
- changes.push_back(ValueStoreChange(key3_, val3_->DeepCopy(), NULL));
- changes.push_back(
- ValueStoreChange("qwerty", val3_->DeepCopy(), NULL));
+ changes.push_back(ValueStoreChange(key3_, val3_->DeepCopy(), nullptr));
+ changes.push_back(ValueStoreChange("qwerty", val3_->DeepCopy(), nullptr));
EXPECT_PRED_FORMAT2(ChangesEq, changes, storage_->Clear());
EXPECT_PRED_FORMAT2(ChangesEq, ValueStoreChangeList(), storage_->Clear());
}
« extensions/browser/api/bluetooth/bluetooth_apitest.cc ('K') | « extensions/browser/value_store/value_store_frontend.cc ('k') | extensions/browser/verified_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698