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

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

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
index 11612587a00085dcec493e786be2efa00734146c..50b69fdec4d1e5d2e01d26a2ddfa5a702e4851e6 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
@@ -148,16 +148,18 @@ TEST(WebRequestActionTest, TestPermissions) {
   // Check that redirect works on regular URLs but not on protected URLs.
   TestURLRequest regular_request(GURL("http://test.com"), NULL, &context);
   std::list<LinkedPtrEventResponseDelta> deltas =
-      action_set->CreateDeltas(NULL, "ext1", &regular_request, false,
-          ON_BEFORE_REQUEST, WebRequestRule::OptionalRequestData(),
-          base::Time());
+      action_set->CreateDeltas(
+          NULL, "ext1",
+          WebRequestRule::RequestData(&regular_request, ON_BEFORE_REQUEST),
+          false, base::Time());
   EXPECT_EQ(1u, deltas.size());
 
   TestURLRequest protected_request(GURL(extension_urls::kGalleryBrowsePrefix),
                                    NULL, &context);
-  deltas = action_set->CreateDeltas(NULL, "ext1", &protected_request, false,
-      ON_BEFORE_REQUEST, WebRequestRule::OptionalRequestData(),
-      base::Time());
+  deltas = action_set->CreateDeltas(
+      NULL, "ext1",
+      WebRequestRule::RequestData(&protected_request, ON_BEFORE_REQUEST),
+      false, base::Time());
   EXPECT_EQ(0u, deltas.size());
 }