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

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

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc
index ad0348b428e673ee39fb4832752348dbe83491a1..12d5dac386458bc46fc163186acd74988a49640b 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry.cc
@@ -22,13 +22,13 @@ WebRequestRulesRegistry::WebRequestRulesRegistry(Profile* profile,
 }
 
 std::set<WebRequestRule::GlobalRuleId>
-WebRequestRulesRegistry::GetMatches(net::URLRequest* request,
-                                    RequestStages request_stage) {
+WebRequestRulesRegistry::GetMatches(
+    const WebRequestRule::RequestData& request_data) {
   std::set<WebRequestRule::GlobalRuleId> result;
 
   // Figure out for which rules the URL match conditions were fulfilled.
   typedef std::set<URLMatcherConditionSet::ID> URLMatches;
-  URLMatches url_matches = url_matcher_.MatchURL(request->url());
+  URLMatches url_matches = url_matcher_.MatchURL(request_data.request->url());
 
   // Then we need to check for each of these, whether the other
   // WebRequestConditionAttributes are also fulfilled.
@@ -38,7 +38,7 @@ WebRequestRulesRegistry::GetMatches(net::URLRequest* request,
     CHECK(rule_trigger != rule_triggers_.end());
 
     WebRequestRule* rule = rule_trigger->second;
-    if (rule->conditions().IsFulfilled(*url_match, request, request_stage))
+    if (rule->conditions().IsFulfilled(*url_match, request_data))
       result.insert(rule->id());
   }
   return result;
@@ -46,15 +46,13 @@ WebRequestRulesRegistry::GetMatches(net::URLRequest* request,
 
 std::list<LinkedPtrEventResponseDelta> WebRequestRulesRegistry::CreateDeltas(
     const ExtensionInfoMap* extension_info_map,
-    net::URLRequest* request,
-    bool crosses_incognito,
-    RequestStages request_stage,
-    const WebRequestRule::OptionalRequestData& optional_request_data) {
+    const WebRequestRule::RequestData& request_data,
+    bool crosses_incognito) {
   if (webrequest_rules_.empty())
     return std::list<LinkedPtrEventResponseDelta>();
 
   std::set<WebRequestRule::GlobalRuleId> matches =
-      GetMatches(request, request_stage);
+      GetMatches(request_data);
 
   // Sort all matching rules by their priority so that they can be processed
   // in decreasing order.
@@ -102,8 +100,7 @@ std::list<LinkedPtrEventResponseDelta> WebRequestRulesRegistry::CreateDeltas(
       continue;
 
     std::list<LinkedPtrEventResponseDelta> rule_result =
-        rule->CreateDeltas(extension_info_map, request, crosses_incognito,
-                           request_stage, optional_request_data);
+        rule->CreateDeltas(extension_info_map, request_data, crosses_incognito);
     result.splice(result.begin(), rule_result);
 
     min_priorities[extension_id] = std::max(current_min_priority,