Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(950)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc

Issue 11414230: Declarative Web Request: firstPartyForCookiesUrl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Jeffrey's comments addressed Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc ('k') | chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc » ('j') | chrome/common/extensions/api/declarative_web_request.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
index b0e2989b394b290a38b85efa2be0072ba80cb661..e5f27848c18ace939d62950aa7b8c088e66f224e 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
@@ -89,15 +89,15 @@ TEST(WebRequestConditionAttributeTest, ResourceType) {
GURL("http://www.example.com"), NULL, &context);
content::ResourceRequestInfo::AllocateForTesting(&url_request_ok,
ResourceType::MAIN_FRAME, NULL, -1, -1);
- EXPECT_TRUE(attribute->IsFulfilled(
- DeclarativeWebRequestData(&url_request_ok, ON_BEFORE_REQUEST)));
+ EXPECT_TRUE(attribute->IsFulfilled(WebRequestData(&url_request_ok,
+ ON_BEFORE_REQUEST)));
net::TestURLRequest url_request_fail(
GURL("http://www.example.com"), NULL, &context);
content::ResourceRequestInfo::AllocateForTesting(&url_request_ok,
ResourceType::SUB_FRAME, NULL, -1, -1);
- EXPECT_FALSE(attribute->IsFulfilled(
- DeclarativeWebRequestData(&url_request_fail, ON_BEFORE_REQUEST)));
+ EXPECT_FALSE(attribute->IsFulfilled(WebRequestData(&url_request_fail,
+ ON_BEFORE_REQUEST)));
}
TEST(WebRequestConditionAttributeTest, ContentType) {
@@ -129,11 +129,11 @@ TEST(WebRequestConditionAttributeTest, ContentType) {
EXPECT_EQ("", error);
ASSERT_TRUE(attribute_include.get());
EXPECT_FALSE(attribute_include->IsFulfilled(
- DeclarativeWebRequestData(&url_request, ON_BEFORE_REQUEST,
- url_request.response_headers())));
+ WebRequestData(&url_request, ON_BEFORE_REQUEST,
+ url_request.response_headers())));
EXPECT_TRUE(attribute_include->IsFulfilled(
- DeclarativeWebRequestData(&url_request, ON_HEADERS_RECEIVED,
- url_request.response_headers())));
+ WebRequestData(&url_request, ON_HEADERS_RECEIVED,
+ url_request.response_headers())));
scoped_ptr<WebRequestConditionAttribute> attribute_exclude =
WebRequestConditionAttribute::Create(
@@ -141,8 +141,8 @@ TEST(WebRequestConditionAttributeTest, ContentType) {
EXPECT_EQ("", error);
ASSERT_TRUE(attribute_exclude.get());
EXPECT_FALSE(attribute_exclude->IsFulfilled(
- DeclarativeWebRequestData(&url_request, ON_HEADERS_RECEIVED,
- url_request.response_headers())));
+ WebRequestData(&url_request, ON_HEADERS_RECEIVED,
+ url_request.response_headers())));
content_types.Clear();
content_types.Append(Value::CreateStringValue("something/invalid"));
@@ -152,8 +152,8 @@ TEST(WebRequestConditionAttributeTest, ContentType) {
EXPECT_EQ("", error);
ASSERT_TRUE(attribute_unincluded.get());
EXPECT_FALSE(attribute_unincluded->IsFulfilled(
- DeclarativeWebRequestData(&url_request, ON_HEADERS_RECEIVED,
- url_request.response_headers())));
+ WebRequestData(&url_request, ON_HEADERS_RECEIVED,
+ url_request.response_headers())));
scoped_ptr<WebRequestConditionAttribute> attribute_unexcluded =
WebRequestConditionAttribute::Create(
@@ -161,8 +161,8 @@ TEST(WebRequestConditionAttributeTest, ContentType) {
EXPECT_EQ("", error);
ASSERT_TRUE(attribute_unexcluded.get());
EXPECT_TRUE(attribute_unexcluded->IsFulfilled(
- DeclarativeWebRequestData(&url_request, ON_HEADERS_RECEIVED,
- url_request.response_headers())));
+ WebRequestData(&url_request, ON_HEADERS_RECEIVED,
+ url_request.response_headers())));
}
// Testing WebRequestConditionAttributeThirdParty.
@@ -200,22 +200,22 @@ TEST(WebRequestConditionAttributeTest, ThirdParty) {
continue;
const RequestStage stage = static_cast<RequestStage>(i);
url_request.set_first_party_for_cookies(url_empty);
- EXPECT_FALSE(third_party_attribute->IsFulfilled(DeclarativeWebRequestData(
- &url_request, stage)));
- EXPECT_TRUE(first_party_attribute->IsFulfilled(DeclarativeWebRequestData(
- &url_request, stage)));
+ EXPECT_FALSE(third_party_attribute->IsFulfilled(WebRequestData(&url_request,
+ stage)));
+ EXPECT_TRUE(first_party_attribute->IsFulfilled(WebRequestData(&url_request,
+ stage)));
url_request.set_first_party_for_cookies(url_b);
- EXPECT_TRUE(third_party_attribute->IsFulfilled(DeclarativeWebRequestData(
- &url_request, stage)));
- EXPECT_FALSE(first_party_attribute->IsFulfilled(DeclarativeWebRequestData(
- &url_request, stage)));
+ EXPECT_TRUE(third_party_attribute->IsFulfilled(WebRequestData(&url_request,
+ stage)));
+ EXPECT_FALSE(first_party_attribute->IsFulfilled(WebRequestData(&url_request,
+ stage)));
url_request.set_first_party_for_cookies(url_a);
- EXPECT_FALSE(third_party_attribute->IsFulfilled(DeclarativeWebRequestData(
- &url_request, stage)));
- EXPECT_TRUE(first_party_attribute->IsFulfilled(DeclarativeWebRequestData(
- &url_request, stage)));
+ EXPECT_FALSE(third_party_attribute->IsFulfilled(WebRequestData(&url_request,
+ stage)));
+ EXPECT_TRUE(first_party_attribute->IsFulfilled(WebRequestData(&url_request,
+ stage)));
}
}
@@ -283,18 +283,17 @@ TEST(WebRequestConditionAttributeTest, Stages) {
net::TestURLRequest url_request(url_empty, &delegate, &context);
for (size_t i = 0; i < arraysize(active_stages); ++i) {
- EXPECT_FALSE(empty_attribute->IsFulfilled(DeclarativeWebRequestData(
- &url_request, active_stages[i].first)));
+ EXPECT_FALSE(empty_attribute->IsFulfilled(
+ WebRequestData(&url_request, active_stages[i].first)));
for (size_t j = 0; j < one_stage_attributes.size(); ++j) {
- EXPECT_EQ(
- i == j,
- one_stage_attributes[j]->IsFulfilled(DeclarativeWebRequestData(
- &url_request, active_stages[i].first)));
+ EXPECT_EQ(i == j,
+ one_stage_attributes[j]->IsFulfilled(
+ WebRequestData(&url_request, active_stages[i].first)));
}
- EXPECT_TRUE(attribute_with_all->IsFulfilled(DeclarativeWebRequestData(
- &url_request, active_stages[i].first)));
+ EXPECT_TRUE(attribute_with_all->IsFulfilled(
+ WebRequestData(&url_request, active_stages[i].first)));
}
}
@@ -386,7 +385,7 @@ void MatchAndCheck(const std::vector< std::vector<const std::string*> >& tests,
ASSERT_EQ("", error);
ASSERT_TRUE(attribute.get());
- *result = attribute->IsFulfilled(DeclarativeWebRequestData(
+ *result = attribute->IsFulfilled(WebRequestData(
url_request, stage, url_request->response_headers()));
}
« no previous file with comments | « chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc ('k') | chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc » ('j') | chrome/common/extensions/api/declarative_web_request.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698