Refactor request parameters into RequestData struct. Also make RequestStage singular.

chrome/browser/extensions/api/declarative_webrequest/webrequest_condition.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_CONDITION_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_CONDITION_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 28 matching lines @@
       const WebRequestConditionAttributes& condition_attributes);
   ~WebRequestCondition();
 
   // Factory method that instantiates a WebRequestCondition according to
   // the description |condition| passed by the extension API.
   static scoped_ptr<WebRequestCondition> Create(
       URLMatcherConditionFactory* url_matcher_condition_factory,
       const base::Value& condition,
       std::string* error);
 
+  // TODO(yoz): fix ALL the comments
   // Returns whether |request| is a match, given that the URLMatcher found
   // a match for |url_matcher_conditions_|.
-  bool IsFulfilled(net::URLRequest* request, RequestStages request_stage) const;
+  bool IsFulfilled(const WebRequestRule::RequestData& request_data) const;
 
   // Returns a URLMatcherConditionSet::ID which is the canonical representation
   // for all URL patterns that need to be matched by this WebRequestCondition.
   // This ID is registered in a URLMatcher that can inform us in case of a
   // match.
   URLMatcherConditionSet::ID url_matcher_condition_set_id() const {
     return url_matcher_conditions_->id();
   }
 
   // Returns the set of conditions that are checked on the URL. This is the
   // primary trigger for WebRequestCondition and therefore never empty.
   // (If it was empty, the URLMatcher would never notify us about network
   // requests which might fulfill the entire WebRequestCondition).
   scoped_refptr<URLMatcherConditionSet> url_matcher_condition_set() const {
     return url_matcher_conditions_;
   }
 
  private:
   scoped_refptr<URLMatcherConditionSet> url_matcher_conditions_;
   WebRequestConditionAttributes condition_attributes_;
 
-  // Bit vector indicating all RequestStages during which all
+  // Bit vector indicating all RequestStage during which all
   // |condition_attributes_| can be evaluated.
   int applicable_request_stages_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRequestCondition);
 };
 
 // This class stores a set of conditions that may be part of a WebRequestRule.
 // If any condition is fulfilled, the WebRequestActions of the WebRequestRule
 // can be triggered.
 class WebRequestConditionSet {
@@ skipping 14 matching lines @@
 
   const std::vector<linked_ptr<WebRequestCondition> >& conditions() const {
     return conditions_;
   }
 
   // Returns whether any condition in the condition set is fulfilled
   // based on a match |url_match| and the value of |request|. This function
   // should be called for each URLMatcherConditionSet::ID that was found
   // by the URLMatcher to ensure that the each trigger in |match_triggers_| is
   // found.
-  bool IsFulfilled(URLMatcherConditionSet::ID url_match,
-                   net::URLRequest* request,
-                   RequestStages request_stage) const;
+  bool IsFulfilled(
+      URLMatcherConditionSet::ID url_match,
+      const WebRequestRule::RequestData& request_data) const;
 
   // Appends the URLMatcherConditionSet from all conditions to |condition_sets|.
   void GetURLMatcherConditionSets(
       URLMatcherConditionSet::Vector* condition_sets) const;
 
  private:
   typedef std::vector<linked_ptr<WebRequestCondition> > Conditions;
   Conditions conditions_;
 
   typedef std::map<URLMatcherConditionSet::ID, WebRequestCondition*>
       MatchTriggers;
   MatchTriggers match_triggers_;
 
   DISALLOW_COPY_AND_ASSIGN(WebRequestConditionSet);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DECLARATIVE_WEBREQUEST_WEBREQUEST_CONDITION_H_