| Index: chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc b/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc
|
| index c85d9863fe062f2804381fe51df36276e76d1cc6..64d028347b67b7dfcc2bb98f553fb45fb44e11b9 100644
|
| --- a/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc
|
| +++ b/chrome/browser/extensions/api/declarative/declarative_rule_unittest.cc
|
| @@ -217,7 +217,8 @@ class SummingAction : public base::RefCounted<SummingAction> {
|
| SummingAction(int increment, int min_priority)
|
| : increment_(increment), min_priority_(min_priority) {}
|
|
|
| - static scoped_refptr<const SummingAction> Create(const Extension* extension,
|
| + static scoped_refptr<const SummingAction> Create(Profile* profile,
|
| + const Extension* extension,
|
| const base::Value& action,
|
| std::string* error,
|
| bool* bad_message) {
|
| @@ -268,7 +269,7 @@ TEST(DeclarativeActionTest, ErrorActionSet) {
|
| std::string error;
|
| bool bad = false;
|
| scoped_ptr<SummingActionSet> result =
|
| - SummingActionSet::Create(NULL, actions, &error, &bad);
|
| + SummingActionSet::Create(NULL, NULL, actions, &error, &bad);
|
| EXPECT_EQ("the error", error);
|
| EXPECT_FALSE(bad);
|
| EXPECT_FALSE(result);
|
| @@ -276,7 +277,7 @@ TEST(DeclarativeActionTest, ErrorActionSet) {
|
| actions.clear();
|
| actions.push_back(ScopedToLinkedPtr(ParseJson("{\"value\": 1}")));
|
| actions.push_back(ScopedToLinkedPtr(ParseJson("{\"bad\": 3}")));
|
| - result = SummingActionSet::Create(NULL, actions, &error, &bad);
|
| + result = SummingActionSet::Create(NULL, NULL, actions, &error, &bad);
|
| EXPECT_EQ("", error);
|
| EXPECT_TRUE(bad);
|
| EXPECT_FALSE(result);
|
| @@ -293,7 +294,7 @@ TEST(DeclarativeActionTest, ApplyActionSet) {
|
| std::string error;
|
| bool bad = false;
|
| scoped_ptr<SummingActionSet> result =
|
| - SummingActionSet::Create(NULL, actions, &error, &bad);
|
| + SummingActionSet::Create(NULL, NULL, actions, &error, &bad);
|
| EXPECT_EQ("", error);
|
| EXPECT_FALSE(bad);
|
| ASSERT_TRUE(result);
|
| @@ -335,6 +336,7 @@ TEST(DeclarativeRuleTest, Create) {
|
| URLMatcher matcher;
|
| std::string error;
|
| scoped_ptr<Rule> rule(Rule::Create(matcher.condition_factory(),
|
| + NULL,
|
| extension.get(),
|
| install_time,
|
| json_rule,
|
| @@ -403,6 +405,7 @@ TEST(DeclarativeRuleTest, CheckConsistency) {
|
| "}"),
|
| json_rule.get()));
|
| scoped_ptr<Rule> rule(Rule::Create(matcher.condition_factory(),
|
| + NULL,
|
| extension.get(),
|
| base::Time(),
|
| json_rule,
|
| @@ -425,6 +428,7 @@ TEST(DeclarativeRuleTest, CheckConsistency) {
|
| "}"),
|
| json_rule.get()));
|
| rule = Rule::Create(matcher.condition_factory(),
|
| + NULL,
|
| extension.get(),
|
| base::Time(),
|
| json_rule,
|
|
|