| Index: extensions/browser/api/declarative/declarative_rule_unittest.cc
|
| diff --git a/extensions/browser/api/declarative/declarative_rule_unittest.cc b/extensions/browser/api/declarative/declarative_rule_unittest.cc
|
| index 552145d1fe612e74754d6b7fc5f4d99e75859eab..81cc2ecd900759b2446f4f56bf9b221d6fcc9938 100644
|
| --- a/extensions/browser/api/declarative/declarative_rule_unittest.cc
|
| +++ b/extensions/browser/api/declarative/declarative_rule_unittest.cc
|
| @@ -53,7 +53,7 @@ struct RecordingCondition {
|
| URLMatcherConditionFactory* url_matcher_condition_factory,
|
| const base::Value& condition,
|
| std::string* error) {
|
| - const base::DictionaryValue* dict = NULL;
|
| + const base::DictionaryValue* dict = nullptr;
|
| if (condition.GetAsDictionary(&dict) && dict->HasKey("bad_key")) {
|
| *error = "Found error key";
|
| return scoped_ptr<RecordingCondition>();
|
| @@ -75,7 +75,7 @@ TEST(DeclarativeConditionTest, ErrorConditionSet) {
|
|
|
| std::string error;
|
| scoped_ptr<RecordingConditionSet> result = RecordingConditionSet::Create(
|
| - NULL, matcher.condition_factory(), conditions, &error);
|
| + nullptr, matcher.condition_factory(), conditions, &error);
|
| EXPECT_EQ("Found error key", error);
|
| ASSERT_FALSE(result);
|
| }
|
| @@ -89,7 +89,7 @@ TEST(DeclarativeConditionTest, CreateConditionSet) {
|
| // Test insertion
|
| std::string error;
|
| scoped_ptr<RecordingConditionSet> result = RecordingConditionSet::Create(
|
| - NULL, matcher.condition_factory(), conditions, &error);
|
| + nullptr, matcher.condition_factory(), conditions, &error);
|
| EXPECT_EQ("", error);
|
| ASSERT_TRUE(result);
|
| EXPECT_EQ(2u, result->conditions().size());
|
| @@ -169,7 +169,7 @@ TEST(DeclarativeConditionTest, FulfillConditionSet) {
|
| // Test insertion
|
| std::string error;
|
| scoped_ptr<FulfillableConditionSet> result =
|
| - FulfillableConditionSet::Create(NULL, NULL, conditions, &error);
|
| + FulfillableConditionSet::Create(nullptr, nullptr, conditions, &error);
|
| ASSERT_EQ("", error);
|
| ASSERT_TRUE(result);
|
| EXPECT_EQ(4u, result->conditions().size());
|
| @@ -225,15 +225,15 @@ class SummingAction : public base::RefCounted<SummingAction> {
|
| bool* bad_message) {
|
| int increment = 0;
|
| int min_priority = 0;
|
| - const base::DictionaryValue* dict = NULL;
|
| + const base::DictionaryValue* dict = nullptr;
|
| EXPECT_TRUE(action.GetAsDictionary(&dict));
|
| if (dict->HasKey("error")) {
|
| EXPECT_TRUE(dict->GetString("error", error));
|
| - return scoped_refptr<const SummingAction>(NULL);
|
| + return scoped_refptr<const SummingAction>(nullptr);
|
| }
|
| if (dict->HasKey("bad")) {
|
| *bad_message = true;
|
| - return scoped_refptr<const SummingAction>(NULL);
|
| + return scoped_refptr<const SummingAction>(nullptr);
|
| }
|
|
|
| EXPECT_TRUE(dict->GetInteger("value", &increment));
|
| @@ -270,7 +270,7 @@ TEST(DeclarativeActionTest, ErrorActionSet) {
|
| std::string error;
|
| bool bad = false;
|
| scoped_ptr<SummingActionSet> result =
|
| - SummingActionSet::Create(NULL, NULL, actions, &error, &bad);
|
| + SummingActionSet::Create(nullptr, nullptr, actions, &error, &bad);
|
| EXPECT_EQ("the error", error);
|
| EXPECT_FALSE(bad);
|
| EXPECT_FALSE(result);
|
| @@ -278,7 +278,7 @@ TEST(DeclarativeActionTest, ErrorActionSet) {
|
| actions.clear();
|
| actions.push_back(ScopedToLinkedPtr(ParseJson("{\"value\": 1}")));
|
| actions.push_back(ScopedToLinkedPtr(ParseJson("{\"bad\": 3}")));
|
| - result = SummingActionSet::Create(NULL, NULL, actions, &error, &bad);
|
| + result = SummingActionSet::Create(nullptr, nullptr, actions, &error, &bad);
|
| EXPECT_EQ("", error);
|
| EXPECT_TRUE(bad);
|
| EXPECT_FALSE(result);
|
| @@ -295,7 +295,7 @@ TEST(DeclarativeActionTest, ApplyActionSet) {
|
| std::string error;
|
| bool bad = false;
|
| scoped_ptr<SummingActionSet> result =
|
| - SummingActionSet::Create(NULL, NULL, actions, &error, &bad);
|
| + SummingActionSet::Create(nullptr, nullptr, actions, &error, &bad);
|
| EXPECT_EQ("", error);
|
| EXPECT_FALSE(bad);
|
| ASSERT_TRUE(result);
|
| @@ -337,7 +337,7 @@ TEST(DeclarativeRuleTest, Create) {
|
| URLMatcher matcher;
|
| std::string error;
|
| scoped_ptr<Rule> rule(Rule::Create(matcher.condition_factory(),
|
| - NULL,
|
| + nullptr,
|
| extension.get(),
|
| install_time,
|
| json_rule,
|
| @@ -406,7 +406,7 @@ TEST(DeclarativeRuleTest, CheckConsistency) {
|
| "}"),
|
| json_rule.get()));
|
| scoped_ptr<Rule> rule(Rule::Create(matcher.condition_factory(),
|
| - NULL,
|
| + nullptr,
|
| extension.get(),
|
| base::Time(),
|
| json_rule,
|
| @@ -429,7 +429,7 @@ TEST(DeclarativeRuleTest, CheckConsistency) {
|
| "}"),
|
| json_rule.get()));
|
| rule = Rule::Create(matcher.condition_factory(),
|
| - NULL,
|
| + nullptr,
|
| extension.get(),
|
| base::Time(),
|
| json_rule,
|
|
|