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

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

Issue 12328079: Update TestURLRequest constructor interface in extensions unit tests. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Rebase onto master. Created 7 years, 9 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
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 c6751c75fcd358899779bb4e615998cf1a7bdf4d..d7f2ea4ba230937dd56313c60d7704fd0515cdf3 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
@@ -88,14 +88,14 @@ TEST(WebRequestConditionAttributeTest, ResourceType) {
net::TestURLRequestContext context;
net::TestURLRequest url_request_ok(
- GURL("http://www.example.com"), NULL, &context);
+ GURL("http://www.example.com"), NULL, &context, NULL);
content::ResourceRequestInfo::AllocateForTesting(&url_request_ok,
ResourceType::SUB_FRAME, NULL, -1, -1);
EXPECT_TRUE(attribute->IsFulfilled(WebRequestData(&url_request_ok,
ON_BEFORE_REQUEST)));
net::TestURLRequest url_request_fail(
- GURL("http://www.example.com"), NULL, &context);
+ GURL("http://www.example.com"), NULL, &context, NULL);
content::ResourceRequestInfo::AllocateForTesting(&url_request_fail,
ResourceType::MAIN_FRAME, NULL, -1, -1);
EXPECT_FALSE(attribute->IsFulfilled(WebRequestData(&url_request_fail,
@@ -118,8 +118,8 @@ TEST(WebRequestConditionAttributeTest, ContentType) {
net::TestURLRequestContext context;
net::TestDelegate delegate;
- net::TestURLRequest url_request(test_server.GetURL("files/headers.html"),
- &delegate, &context);
+ net::TestURLRequest url_request(
+ test_server.GetURL("files/headers.html"), &delegate, &context, NULL);
url_request.Start();
MessageLoop::current()->Run();
@@ -195,7 +195,7 @@ TEST(WebRequestConditionAttributeTest, ThirdParty) {
const GURL url_b("http://b.com");
net::TestURLRequestContext context;
net::TestDelegate delegate;
- net::TestURLRequest url_request(url_a, &delegate, &context);
+ net::TestURLRequest url_request(url_a, &delegate, &context, NULL);
for (unsigned int i = 1; i <= kLastActiveStage; i <<= 1) {
if (!(kActiveStages & i))
@@ -282,7 +282,7 @@ TEST(WebRequestConditionAttributeTest, Stages) {
const GURL url_empty;
net::TestURLRequestContext context;
net::TestDelegate delegate;
- net::TestURLRequest url_request(url_empty, &delegate, &context);
+ net::TestURLRequest url_request(url_empty, &delegate, &context, NULL);
for (size_t i = 0; i < arraysize(active_stages); ++i) {
EXPECT_FALSE(empty_attribute->IsFulfilled(
@@ -404,7 +404,7 @@ TEST(WebRequestConditionAttributeTest, RequestHeaders) {
net::TestURLRequestContext context;
net::TestDelegate delegate;
net::TestURLRequest url_request(GURL("http://example.com"), // Dummy URL.
- &delegate, &context);
+ &delegate, &context, NULL);
url_request.SetExtraRequestHeaderByName(
"Custom-header", "custom/value", true /* overwrite */);
url_request.Start();
@@ -489,7 +489,7 @@ TEST(WebRequestConditionAttributeTest, ResponseHeaders) {
net::TestURLRequestContext context;
net::TestDelegate delegate;
net::TestURLRequest url_request(test_server.GetURL("files/headers.html"),
- &delegate, &context);
+ &delegate, &context, NULL);
url_request.Start();
MessageLoop::current()->Run();

Powered by Google App Engine
This is Rietveld 408576698