| Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc
|
| diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc
|
| index 78e1b2b499af6dc6ecafcbfacd4f6190a8a2e506..50a8727b5f8ac57110e4972b9e850f60b3c41cbf 100644
|
| --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc
|
| +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc
|
| @@ -152,7 +152,7 @@ int WebRequestConditionAttributeResourceType::GetStages() const {
|
| }
|
|
|
| bool WebRequestConditionAttributeResourceType::IsFulfilled(
|
| - const DeclarativeWebRequestData& request_data) const {
|
| + const WebRequestData& request_data) const {
|
| if (!(request_data.stage & GetStages()))
|
| return false;
|
| const content::ResourceRequestInfo* info =
|
| @@ -223,7 +223,7 @@ int WebRequestConditionAttributeContentType::GetStages() const {
|
| }
|
|
|
| bool WebRequestConditionAttributeContentType::IsFulfilled(
|
| - const DeclarativeWebRequestData& request_data) const {
|
| + const WebRequestData& request_data) const {
|
| if (!(request_data.stage & GetStages()))
|
| return false;
|
| std::string content_type;
|
| @@ -568,7 +568,7 @@ int WebRequestConditionAttributeRequestHeaders::GetStages() const {
|
| }
|
|
|
| bool WebRequestConditionAttributeRequestHeaders::IsFulfilled(
|
| - const DeclarativeWebRequestData& request_data) const {
|
| + const WebRequestData& request_data) const {
|
| if (!(request_data.stage & GetStages()))
|
| return false;
|
|
|
| @@ -632,7 +632,7 @@ int WebRequestConditionAttributeResponseHeaders::GetStages() const {
|
| }
|
|
|
| bool WebRequestConditionAttributeResponseHeaders::IsFulfilled(
|
| - const DeclarativeWebRequestData& request_data) const {
|
| + const WebRequestData& request_data) const {
|
| if (!(request_data.stage & GetStages()))
|
| return false;
|
|
|
| @@ -703,7 +703,7 @@ int WebRequestConditionAttributeThirdParty::GetStages() const {
|
| }
|
|
|
| bool WebRequestConditionAttributeThirdParty::IsFulfilled(
|
| - const DeclarativeWebRequestData& request_data) const {
|
| + const WebRequestData& request_data) const {
|
| if (!(request_data.stage & GetStages()))
|
| return false;
|
|
|
| @@ -798,7 +798,7 @@ int WebRequestConditionAttributeStages::GetStages() const {
|
| }
|
|
|
| bool WebRequestConditionAttributeStages::IsFulfilled(
|
| - const DeclarativeWebRequestData& request_data) const {
|
| + const WebRequestData& request_data) const {
|
| // Note: removing '!=' triggers warning C4800 on the VS compiler.
|
| return (request_data.stage & GetStages()) != 0;
|
| }
|
|
|