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

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

This simplifies (eventually) passing the optional parameters into WebRequestCondition.

BUG=112155
TBR=ben@chromium.org


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=149854

[Yoyo Zhou, 2012-08-03 09:43:35]

Hi Dominic,

 I am not sure whether WebRequestRule is the best place to keep this RequestData
struct, or whether it belongs someplace more generic. Any thoughts?

 By the way, the rationale for this CL will be coming in another CL.

[battre, 2012-08-03 10:06:43]

lgtm

https://chromiumcodereview.appspot.com/10831150/diff/7021/chrome/browser/exte...
File
chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
(right):

https://chromiumcodereview.appspot.com/10831150/diff/7021/chrome/browser/exte...
chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc:346:
WebRequestRule::RequestData(&request, ON_BEFORE_REQUEST, NULL),
nit: no need to pass NULL here.

https://chromiumcodereview.appspot.com/10831150/diff/7021/chrome/browser/exte...
chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc:396:
WebRequestRule::RequestData(&request, ON_BEFORE_REQUEST, NULL),
nit: no need to pass NULL here.

[battre, 2012-08-03 10:08:06]

Oh, there is currently a CL in the commit queue that will require some more
changes. http://codereview.chromium.org/10447090/



On 2012/08/03 10:06:43, battre wrote:
> lgtm
> 
>
https://chromiumcodereview.appspot.com/10831150/diff/7021/chrome/browser/exte...
> File
>
chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
> (right):
> 
>
https://chromiumcodereview.appspot.com/10831150/diff/7021/chrome/browser/exte...
>
chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc:346:
> WebRequestRule::RequestData(&request, ON_BEFORE_REQUEST, NULL),
> nit: no need to pass NULL here.
> 
>
https://chromiumcodereview.appspot.com/10831150/diff/7021/chrome/browser/exte...
>
chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc:396:
> WebRequestRule::RequestData(&request, ON_BEFORE_REQUEST, NULL),
> nit: no need to pass NULL here.

[Yoyo Zhou, 2012-08-03 10:12:19]

Thanks for the heads-up. I'll rebase on that after it lands.

https://chromiumcodereview.appspot.com/10831150/diff/7021/chrome/browser/exte...
File
chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
(right):

https://chromiumcodereview.appspot.com/10831150/diff/7021/chrome/browser/exte...
chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc:346:
WebRequestRule::RequestData(&request, ON_BEFORE_REQUEST, NULL),
On 2012/08/03 10:06:43, battre wrote:
> nit: no need to pass NULL here.

Oh right, this was before I realized there were enough call sites that would've
passed in NULL to justify the 2nd constructor.

[commit-bot: I haz the power, 2012-08-03 12:17:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoz@chromium.org/10831150/23

[commit-bot: I haz the power, 2012-08-03 12:22:40]

Failed to apply patch for
chrome/browser/extensions/api/declarative_webrequest/webrequest_action.cc:
While running patch -p1 --forward --force;
patching file
chrome/browser/extensions/api/declarative_webrequest/webrequest_action.cc
Hunk #2 succeeded at 280 (offset -138 lines).
Hunk #3 succeeded at 324 (offset -138 lines).
Hunk #4 succeeded at 352 (offset -138 lines).
Hunk #5 succeeded at 390 (offset -138 lines).
Hunk #6 succeeded at 426 (offset -138 lines).
Hunk #7 succeeded at 510 (offset -138 lines).
Hunk #8 succeeded at 532 (offset -138 lines).
Hunk #9 succeeded at 566 (offset -138 lines).
Hunk #10 succeeded at 598 (offset -138 lines).
Hunk #11 succeeded at 632 (offset -138 lines).
Hunk #12 succeeded at 677 (offset -138 lines).
Hunk #13 succeeded at 732 (offset -138 lines).
Hunk #14 FAILED at 898.
Hunk #15 FAILED at 933.
2 out of 15 hunks FAILED -- saving rejects to file
chrome/browser/extensions/api/declarative_webrequest/webrequest_action.cc.rej

[commit-bot: I haz the power, 2012-08-03 12:44:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/yoz@chromium.org/10831150/2005

[commit-bot: I haz the power, 2012-08-03 14:44:58]

Change committed as 149854