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

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

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h
index 96d0a3d42e1dbb65ea27a36429f7de38db23bf68..bf0413a449c8b67c6334b4486d0ded9df3fbbd25 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action.h
@@ -11,7 +11,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/linked_ptr.h"
-#include "chrome/browser/extensions/api/declarative_webrequest/request_stages.h"
+#include "chrome/browser/extensions/api/declarative_webrequest/request_stage.h"
 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h"
 #include "chrome/common/extensions/api/events.h"
 #include "googleurl/src/gurl.h"
@@ -63,7 +63,7 @@ class WebRequestAction {
   WebRequestAction();
   virtual ~WebRequestAction();
 
-  // Returns a bit vector representing extensions::RequestStages. The bit vector
+  // Returns a bit vector representing extensions::RequestStage. The bit vector
   // contains a 1 for each request stage during which the condition can be
   // tested.
   virtual int GetStages() const = 0;
@@ -103,9 +103,7 @@ class WebRequestAction {
   // Returns a description of the modification to |request| caused by this
   // action.
   virtual LinkedPtrEventResponseDelta CreateDelta(
-      net::URLRequest* request,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
+      const WebRequestRule::RequestData& request_data,
       const std::string& extension_id,
       const base::Time& extension_install_time) const = 0;
 };
@@ -136,10 +134,8 @@ class WebRequestActionSet {
   std::list<LinkedPtrEventResponseDelta> CreateDeltas(
       const ExtensionInfoMap* extension_info_map,
       const std::string& extension_id,
-      net::URLRequest* request,
+      const WebRequestRule::RequestData& request_data,
       bool crosses_incognito,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
       const base::Time& extension_install_time) const;
 
   // Returns the minimum priority of rules that may be evaluated after
@@ -168,9 +164,7 @@ class WebRequestCancelAction : public WebRequestAction {
   virtual int GetStages() const OVERRIDE;
   virtual Type GetType() const OVERRIDE;
   virtual LinkedPtrEventResponseDelta CreateDelta(
-      net::URLRequest* request,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
+      const WebRequestRule::RequestData& request_data,
       const std::string& extension_id,
       const base::Time& extension_install_time) const OVERRIDE;
 
@@ -188,9 +182,7 @@ class WebRequestRedirectAction : public WebRequestAction {
   virtual int GetStages() const OVERRIDE;
   virtual Type GetType() const OVERRIDE;
   virtual LinkedPtrEventResponseDelta CreateDelta(
-      net::URLRequest* request,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
+      const WebRequestRule::RequestData& request_data,
       const std::string& extension_id,
       const base::Time& extension_install_time) const OVERRIDE;
 
@@ -211,9 +203,7 @@ class WebRequestRedirectToTransparentImageAction : public WebRequestAction {
   virtual Type GetType() const OVERRIDE;
   virtual bool ShouldEnforceHostPermissions() const OVERRIDE;
   virtual LinkedPtrEventResponseDelta CreateDelta(
-      net::URLRequest* request,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
+      const WebRequestRule::RequestData& request_data,
       const std::string& extension_id,
       const base::Time& extension_install_time) const OVERRIDE;
 
@@ -233,9 +223,7 @@ class WebRequestRedirectToEmptyDocumentAction : public WebRequestAction {
   virtual Type GetType() const OVERRIDE;
   virtual bool ShouldEnforceHostPermissions() const OVERRIDE;
   virtual LinkedPtrEventResponseDelta CreateDelta(
-      net::URLRequest* request,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
+      const WebRequestRule::RequestData& request_data,
       const std::string& extension_id,
       const base::Time& extension_install_time) const OVERRIDE;
 
@@ -261,9 +249,7 @@ class WebRequestRedirectByRegExAction : public WebRequestAction {
   virtual int GetStages() const OVERRIDE;
   virtual Type GetType() const OVERRIDE;
   virtual LinkedPtrEventResponseDelta CreateDelta(
-      net::URLRequest* request,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
+      const WebRequestRule::RequestData& request_data,
       const std::string& extension_id,
       const base::Time& extension_install_time) const OVERRIDE;
 
@@ -285,9 +271,7 @@ class WebRequestSetRequestHeaderAction : public WebRequestAction {
   virtual int GetStages() const OVERRIDE;
   virtual Type GetType() const OVERRIDE;
   virtual LinkedPtrEventResponseDelta CreateDelta(
-      net::URLRequest* request,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
+      const WebRequestRule::RequestData& request_data,
       const std::string& extension_id,
       const base::Time& extension_install_time) const OVERRIDE;
 
@@ -307,9 +291,7 @@ class WebRequestRemoveRequestHeaderAction : public WebRequestAction {
   virtual int GetStages() const OVERRIDE;
   virtual Type GetType() const OVERRIDE;
   virtual LinkedPtrEventResponseDelta CreateDelta(
-      net::URLRequest* request,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
+      const WebRequestRule::RequestData& request_data,
       const std::string& extension_id,
       const base::Time& extension_install_time) const OVERRIDE;
 
@@ -329,9 +311,7 @@ class WebRequestAddResponseHeaderAction : public WebRequestAction {
   virtual int GetStages() const OVERRIDE;
   virtual Type GetType() const OVERRIDE;
   virtual LinkedPtrEventResponseDelta CreateDelta(
-      net::URLRequest* request,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
+      const WebRequestRule::RequestData& request_data,
       const std::string& extension_id,
       const base::Time& extension_install_time) const OVERRIDE;
 
@@ -353,9 +333,7 @@ class WebRequestRemoveResponseHeaderAction : public WebRequestAction {
   virtual int GetStages() const OVERRIDE;
   virtual Type GetType() const OVERRIDE;
   virtual LinkedPtrEventResponseDelta CreateDelta(
-      net::URLRequest* request,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
+      const WebRequestRule::RequestData& request_data,
       const std::string& extension_id,
       const base::Time& extension_install_time) const OVERRIDE;
 
@@ -378,9 +356,7 @@ class WebRequestIgnoreRulesAction : public WebRequestAction {
   virtual int GetMinimumPriority() const OVERRIDE;
   virtual bool ShouldEnforceHostPermissions() const OVERRIDE;
   virtual LinkedPtrEventResponseDelta CreateDelta(
-      net::URLRequest* request,
-      RequestStages request_stage,
-      const WebRequestRule::OptionalRequestData& optional_request_data,
+      const WebRequestRule::RequestData& request_data,
       const std::string& extension_id,
       const base::Time& extension_install_time) const OVERRIDE;