Refactoring how conditions without URL attributes are handled.

chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h
index 953dac3bf1b7c05002b1fc0ccd76c65bc6f8664c..08d0a934ea6546d72285d23aa109251736edaa27 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.h
@@ -68,7 +68,7 @@ class WebRequestRulesRegistry : public RulesRegistryWithCache {
 
   // TODO(battre): This will become an implementation detail, because we need
   // a way to also execute the actions of the rules.
-  std::set<WebRequestRule::GlobalRuleId> GetMatches(
+  std::set<const WebRequestRule*> GetMatches(

[vabr (Chromium), 2012/12/18 18:26:42]

If it is for some reason necessary to return (a set of) GlobalRuleID instead of
a pointer to a rule, please let me know. Reverting to GlobalRuleID would add
some more complexity to GetMatches, whereas changing the callsites of GetMatches
did not seem to make anything ugly, so I went for returning the rule pointers.

[Jeffrey Yasskin, 2012/12/18 21:56:02]

The only risk here would be if WebRequestRules are destroyed before GetMatches
returns them. I don't believe they can be, so returning pointers is cheaper and
equally safe.

[vabr (Chromium), 2012/12/19 08:38:19]

Oh, right. Yes, I hope the only place where rules are deleted is
RemoveRulesImpl, which should not be running concurrently with GetMatches.
Dominic, could you please confirm this?

       const WebRequestRule::RequestData& request_data);
 
   // Returns which modifications should be executed on the network request
@@ -100,6 +100,11 @@ class WebRequestRulesRegistry : public RulesRegistryWithCache {
       const std::string& extension_id) const;
   virtual void ClearCacheOnNavigation();
 
+  const std::set<const WebRequestRule*>&
+  rules_with_untriggered_conditions_for_test() const {
+    return rules_with_untriggered_conditions_;
+  }
+
  private:
   typedef std::map<URLMatcherConditionSet::ID, WebRequestRule*> RuleTriggers;
   typedef std::map<WebRequestRule::GlobalRuleId, linked_ptr<WebRequestRule> >
@@ -109,6 +114,11 @@ class WebRequestRulesRegistry : public RulesRegistryWithCache {
   // the URLMatcherConditionSet::ID was returned by the |url_matcher_|.
   RuleTriggers rule_triggers_;
 
+  // These rules contain condition sets with conditions without URL attributes.
+  // Such conditions are not triggered by URL matcher, so we need to test them
+  // separately.
+  std::set<const WebRequestRule*> rules_with_untriggered_conditions_;
+
   RulesMap webrequest_rules_;
 
   URLMatcher url_matcher_;