| Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
|
| index 754c6c5745ea670a49a4572c329cc6a3d18ccc56..e7d35169ea06b219f40d7d6eb2f94b1f3859ff3f 100644
|
| --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
|
| +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
|
| @@ -274,7 +274,7 @@ TEST_F(WebRequestRulesRegistryTest, AddRulesImpl) {
|
| rules.push_back(CreateRule1());
|
| rules.push_back(CreateRule2());
|
|
|
| - error = registry->AddRules(kExtensionId, rules);
|
| + error = registry->AddRules(kExtensionId, rules, false);
|
| EXPECT_EQ("", error);
|
| EXPECT_EQ(1, registry->num_clear_cache_calls());
|
|
|
| @@ -315,7 +315,7 @@ TEST_F(WebRequestRulesRegistryTest, RemoveRulesImpl) {
|
| std::vector<linked_ptr<RulesRegistry::Rule> > rules_to_add;
|
| rules_to_add.push_back(CreateRule1());
|
| rules_to_add.push_back(CreateRule2());
|
| - error = registry->AddRules(kExtensionId, rules_to_add);
|
| + error = registry->AddRules(kExtensionId, rules_to_add, false);
|
| EXPECT_EQ("", error);
|
| EXPECT_EQ(1, registry->num_clear_cache_calls());
|
|
|
| @@ -362,12 +362,12 @@ TEST_F(WebRequestRulesRegistryTest, RemoveAllRulesImpl) {
|
| // Setup RulesRegistry to contain two rules, one for each extension.
|
| std::vector<linked_ptr<RulesRegistry::Rule> > rules_to_add(1);
|
| rules_to_add[0] = CreateRule1();
|
| - error = registry->AddRules(kExtensionId, rules_to_add);
|
| + error = registry->AddRules(kExtensionId, rules_to_add, false);
|
| EXPECT_EQ("", error);
|
| EXPECT_EQ(1, registry->num_clear_cache_calls());
|
|
|
| rules_to_add[0] = CreateRule2();
|
| - error = registry->AddRules(kExtensionId2, rules_to_add);
|
| + error = registry->AddRules(kExtensionId2, rules_to_add, false);
|
| EXPECT_EQ("", error);
|
| EXPECT_EQ(2, registry->num_clear_cache_calls());
|
|
|
| @@ -413,12 +413,12 @@ TEST_F(WebRequestRulesRegistryTest, Precedences) {
|
|
|
| std::vector<linked_ptr<RulesRegistry::Rule> > rules_to_add_1(1);
|
| rules_to_add_1[0] = CreateRedirectRule("http://www.foo.com");
|
| - error = registry->AddRules(kExtensionId, rules_to_add_1);
|
| + error = registry->AddRules(kExtensionId, rules_to_add_1, false);
|
| EXPECT_EQ("", error);
|
|
|
| std::vector<linked_ptr<RulesRegistry::Rule> > rules_to_add_2(1);
|
| rules_to_add_2[0] = CreateRedirectRule("http://www.bar.com");
|
| - error = registry->AddRules(kExtensionId2, rules_to_add_2);
|
| + error = registry->AddRules(kExtensionId2, rules_to_add_2, false);
|
| EXPECT_EQ("", error);
|
|
|
| GURL url("http://www.google.com");
|
| @@ -457,17 +457,17 @@ TEST_F(WebRequestRulesRegistryTest, Priorities) {
|
|
|
| std::vector<linked_ptr<RulesRegistry::Rule> > rules_to_add_1(1);
|
| rules_to_add_1[0] = CreateRedirectRule("http://www.foo.com");
|
| - error = registry->AddRules(kExtensionId, rules_to_add_1);
|
| + error = registry->AddRules(kExtensionId, rules_to_add_1, false);
|
| EXPECT_EQ("", error);
|
|
|
| std::vector<linked_ptr<RulesRegistry::Rule> > rules_to_add_2(1);
|
| rules_to_add_2[0] = CreateRedirectRule("http://www.bar.com");
|
| - error = registry->AddRules(kExtensionId2, rules_to_add_2);
|
| + error = registry->AddRules(kExtensionId2, rules_to_add_2, false);
|
| EXPECT_EQ("", error);
|
|
|
| std::vector<linked_ptr<RulesRegistry::Rule> > rules_to_add_3(1);
|
| rules_to_add_3[0] = CreateIgnoreRule();
|
| - error = registry->AddRules(kExtensionId, rules_to_add_3);
|
| + error = registry->AddRules(kExtensionId, rules_to_add_3, false);
|
| EXPECT_EQ("", error);
|
|
|
| GURL url("http://www.google.com/index.html");
|
| @@ -588,7 +588,7 @@ TEST_F(WebRequestRulesRegistryTest, GetMatchesCheckFulfilled) {
|
| attributes.push_back(&kNonMatchingNonUrlAttribute);
|
| rules.push_back(CreateCancellingRule(kRuleId3, attributes));
|
|
|
| - error = registry->AddRules(kExtensionId, rules);
|
| + error = registry->AddRules(kExtensionId, rules, false);
|
| EXPECT_EQ("", error);
|
| EXPECT_EQ(1, registry->num_clear_cache_calls());
|
|
|
| @@ -629,7 +629,7 @@ TEST_F(WebRequestRulesRegistryTest, GetMatchesDifferentUrls) {
|
| attributes.push_back(&kFirstPartyUrlAttribute);
|
| rules.push_back(CreateCancellingRule(kRuleId2, attributes));
|
|
|
| - error = registry->AddRules(kExtensionId, rules);
|
| + error = registry->AddRules(kExtensionId, rules, false);
|
| EXPECT_EQ("", error);
|
| EXPECT_EQ(1, registry->num_clear_cache_calls());
|
|
|
|
|