Refactoring how conditions without URL attributes are handled.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_RULES_REGISTRY_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_RULES_REGISTRY_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 82 matching lines @@
   bool IsEmpty() const;
 
  protected:
   virtual ~WebRequestRulesRegistry();
 
   // Virtual for testing:
   virtual base::Time GetExtensionInstallationTime(
       const std::string& extension_id) const;
   virtual void ClearCacheOnNavigation();
 
+  const std::set<const WebRequestRule*>&
+      rules_with_untriggered_conditions_for_test() const {

[vabr (Chromium), 2012/12/13 12:18:06]

Here I'm not sure about the indenting. I've seen often in the *.cc files that if
the return type + function name were too long, the name appeared on a separate
line unindented. But I could not find anything like that in the style guide, so
I left 4 spaces here.

[Jeffrey Yasskin, 2012/12/18 02:24:32]

My editor doesn't indent the function name, so I'd tend to avoid indenting it.

I'd also generally avoid defining a private getter for a private variable. Code
that could call the getter can just access the variable directly.

[battre, 2012/12/18 08:20:44]

I have seen both styles. I think that no spaces is predominant but did not do
any analysis.

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

For the private-getter: note that this is protected, accessing private data. It
is used from a deriving class' code, so it cannot be replaced by a direct
access. It also restricts the access to const only, so I believe it makes sense
here.

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

Thanks both for the advice on indenting. I changed to no spaces.

+    return rules_with_untriggered_conditions_;
+  }
+
  private:
   typedef std::map<URLMatcherConditionSet::ID, WebRequestRule*> RuleTriggers;
   typedef std::map<WebRequestRule::GlobalRuleId, linked_ptr<WebRequestRule> >
       RulesMap;
 
   // Map that tells us which WebRequestRule may match under the condition that
   // 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_;
 
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_RULES_REGISTRY_H_