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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/url_request/url_request_unittest.cc

Issue 10559036: Added URLRequestContext to constructor for URLRequest. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Updated unittests Created 8 years, 6 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
« net/url_request/url_request.cc ('K') | « net/url_request/url_request_throttler_unittest.cc ('k') | remoting/host/url_fetcher.cc » ('j') | webkit/appcache/appcache_request_handler_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_unittest.cc
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index e6b76581c703819f32cac20768ef97b99ee5e94e..7134e33a557fd7295c852164057a0497dc7038fe 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -459,8 +459,7 @@ class URLRequestTestHTTP : public URLRequestTest {
bool include_data) {
static const char kData[] = "hello world";
TestDelegate d;
- URLRequest req(redirect_url, &d);
- req.set_context(&default_context_);
+ URLRequest req(redirect_url, &d, &default_context_);
req.set_method(request_method);
if (include_data) {
req.set_upload(CreateSimpleUploadData(kData).get());
@@ -505,8 +504,7 @@ class URLRequestTestHTTP : public URLRequestTest {
for (int i = 0; i < kIterations; ++i) {
TestDelegate d;
- URLRequest r(test_server_.GetURL("echo"), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("echo"), &d, &default_context_);
r.set_method(method.c_str());
r.AppendBytesToUpload(uploadBytes, kMsgSize);
@@ -569,8 +567,7 @@ TEST_F(URLRequestTestHTTP, FLAKY_ProxyTunnelRedirectTest) {
TestDelegate d;
{
- URLRequest r(GURL("https://www.redirect.com/"), &d);
- r.set_context(&context);
+ URLRequest r(GURL("https://www.redirect.com/"), &d, &context);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -598,8 +595,7 @@ TEST_F(URLRequestTestHTTP, DISABLED_NetworkDelegateTunnelConnectionFailed) {
TestDelegate d;
{
- URLRequest r(GURL("https://www.redirect.com/"), &d);
- r.set_context(&context);
+ URLRequest r(GURL("https://www.redirect.com/"), &d, &context);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -629,8 +625,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelRequest) {
&network_delegate);
{
- URLRequest r(test_server_.GetURL(""), &d);
- r.set_context(&context);
+ URLRequest r(test_server_.GetURL(""), &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -656,8 +651,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelRequestSynchronously) {
&network_delegate);
{
- URLRequest r(test_server_.GetURL(""), &d);
- r.set_context(&context);
+ URLRequest r(test_server_.GetURL(""), &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -686,8 +680,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateRedirectRequest) {
{
GURL original_url(test_server_.GetURL("empty.html"));
- URLRequest r(original_url, &d);
- r.set_context(&context);
+ URLRequest r(original_url, &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -720,8 +713,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateRedirectRequestSynchronously) {
{
GURL original_url(test_server_.GetURL("empty.html"));
- URLRequest r(original_url, &d);
- r.set_context(&context);
+ URLRequest r(original_url, &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -754,8 +746,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateRedirectRequestPost) {
{
GURL original_url(test_server_.GetURL("empty.html"));
- URLRequest r(original_url, &d);
- r.set_context(&context);
+ URLRequest r(original_url, &d, &context);
r.set_method("POST");
r.set_upload(CreateSimpleUploadData(kData).get());
HttpRequestHeaders headers;
@@ -798,8 +789,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredSyncNoAction) {
{
GURL url(test_server_.GetURL("auth-basic"));
- URLRequest r(url, &d);
- r.set_context(&context);
+ URLRequest r(url, &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -831,8 +821,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredSyncSetAuth) {
{
GURL url(test_server_.GetURL("auth-basic"));
- URLRequest r(url, &d);
- r.set_context(&context);
+ URLRequest r(url, &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -862,8 +851,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredSyncCancel) {
{
GURL url(test_server_.GetURL("auth-basic"));
- URLRequest r(url, &d);
- r.set_context(&context);
+ URLRequest r(url, &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -899,8 +887,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredAsyncNoAction) {
{
GURL url(test_server_.GetURL("auth-basic"));
- URLRequest r(url, &d);
- r.set_context(&context);
+ URLRequest r(url, &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -935,8 +922,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredAsyncSetAuth) {
{
GURL url(test_server_.GetURL("auth-basic"));
- URLRequest r(url, &d);
- r.set_context(&context);
+ URLRequest r(url, &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -969,8 +955,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateOnAuthRequiredAsyncCancel) {
{
GURL url(test_server_.GetURL("auth-basic"));
- URLRequest r(url, &d);
- r.set_context(&context);
+ URLRequest r(url, &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -1000,8 +985,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting1) {
context.Init();
{
- URLRequest r(test_server_.GetURL(""), &d);
- r.set_context(&context);
+ URLRequest r(test_server_.GetURL(""), &d, &context);
r.Start();
network_delegate.WaitForState(
@@ -1035,8 +1019,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting2) {
context.Init();
{
- URLRequest r(test_server_.GetURL(""), &d);
- r.set_context(&context);
+ URLRequest r(test_server_.GetURL(""), &d, &context);
r.Start();
network_delegate.WaitForState(
@@ -1070,8 +1053,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting3) {
context.Init();
{
- URLRequest r(test_server_.GetURL(""), &d);
- r.set_context(&context);
+ URLRequest r(test_server_.GetURL(""), &d, &context);
r.Start();
network_delegate.WaitForState(
@@ -1105,8 +1087,7 @@ TEST_F(URLRequestTestHTTP, NetworkDelegateCancelWhileWaiting4) {
context.Init();
{
- URLRequest r(test_server_.GetURL("auth-basic"), &d);
- r.set_context(&context);
+ URLRequest r(test_server_.GetURL("auth-basic"), &d, &context);
r.Start();
network_delegate.WaitForState(
@@ -1137,8 +1118,7 @@ TEST_F(URLRequestTestHTTP, UnexpectedServerAuthTest) {
TestDelegate d;
{
- URLRequest r(GURL("https://www.server-auth.com/"), &d);
- r.set_context(&context);
+ URLRequest r(GURL("https://www.server-auth.com/"), &d, &context);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -1155,8 +1135,7 @@ TEST_F(URLRequestTestHTTP, GetTest_NoCache) {
TestDelegate d;
{
- URLRequest r(test_server_.GetURL(""), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL(""), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -1180,8 +1159,7 @@ TEST_F(URLRequestTestHTTP, GetTest) {
TestDelegate d;
{
- URLRequest r(test_server_.GetURL(""), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL(""), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -1227,8 +1205,7 @@ TEST_F(URLRequestTestHTTP, GetZippedTest) {
context.set_network_delegate(&network_delegate);
context.Init();
- URLRequest r(test_server_.GetURL(test_file), &d);
- r.set_context(&context);
+ URLRequest r(test_server_.GetURL(test_file), &d, &context);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -1267,8 +1244,7 @@ TEST_F(URLRequestTestHTTP, DISABLED_HTTPSToHTTPRedirectNoRefererTest) {
GURL http_destination = test_server_.GetURL("");
TestDelegate d;
URLRequest req(https_test_server.GetURL(
- "server-redirect?" + http_destination.spec()), &d);
- req.set_context(&default_context_);
+ "server-redirect?" + http_destination.spec()), &d, &default_context_);
req.set_referrer("https://www.referrer.com/");
req.Start();
MessageLoop::current()->Run();
@@ -1288,8 +1264,7 @@ TEST_F(URLRequestTestHTTP, MultipleRedirectTest) {
GURL original_url = test_server_.GetURL(
"server-redirect?" + middle_redirect_url.spec());
TestDelegate d;
- URLRequest req(original_url, &d);
- req.set_context(&default_context_);
+ URLRequest req(original_url, &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -1326,8 +1301,7 @@ TEST_F(HTTPSRequestTest, DISABLED_HTTPSGetTest) {
TestDelegate d;
{
- URLRequest r(test_server.GetURL(""), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server.GetURL(""), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -1356,8 +1330,7 @@ TEST_F(HTTPSRequestTest, HTTPSMismatchedTest) {
TestDelegate d;
{
d.set_allow_certificate_errors(err_allowed);
- URLRequest r(test_server.GetURL(""), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server.GetURL(""), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -1391,8 +1364,7 @@ TEST_F(HTTPSRequestTest, HTTPSExpiredTest) {
TestDelegate d;
{
d.set_allow_certificate_errors(err_allowed);
- URLRequest r(test_server.GetURL(""), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server.GetURL(""), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -1476,8 +1448,7 @@ class HTTPSOCSPTest : public HTTPSRequestTest {
TestDelegate d;
d.set_allow_certificate_errors(true);
- URLRequest r(test_server.GetURL(""), &d);
- r.set_context(&context_);
+ URLRequest r(test_server.GetURL(""), &d, &context_);
r.Start();
MessageLoop::current()->Run();
@@ -1743,8 +1714,7 @@ TEST_F(HTTPSRequestTest, SSLv3Fallback) {
TestURLRequestContext context(true);
context.Init();
d.set_allow_certificate_errors(true);
- URLRequest r(test_server.GetURL(""), &d);
- r.set_context(&context);
+ URLRequest r(test_server.GetURL(""), &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -1779,8 +1749,7 @@ TEST_F(HTTPSRequestTest, TLSv1Fallback) {
TestURLRequestContext context(true);
context.Init();
d.set_allow_certificate_errors(true);
- URLRequest r(test_server.GetURL(""), &d);
- r.set_context(&context);
+ URLRequest r(test_server.GetURL(""), &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -1820,8 +1789,8 @@ TEST_F(HTTPSRequestTest, HTTPSPreloadedHSTSTest) {
TestDelegate d;
URLRequest r(GURL(StringPrintf("https://www.google.com:%d",
test_server.host_port_pair().port())),
erikwright (departed) 2012/06/19 21:06:22 spacing was already weird here, but please fix it.
shalev 2012/06/20 20:13:12 Done.
- &d);
- r.set_context(&context);
+ &d,
+ &context);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -1866,8 +1835,8 @@ TEST_F(HTTPSRequestTest, HTTPSErrorsNoClobberTSSTest) {
TestDelegate d;
URLRequest r(GURL(StringPrintf("https://www.google.com:%d",
test_server.host_port_pair().port())),
- &d);
erikwright (departed) 2012/06/19 21:06:22 and here.
shalev 2012/06/20 20:13:12 Done.
- r.set_context(&context);
+ &d,
+ &context);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -1929,8 +1898,7 @@ TEST_F(HTTPSRequestTest, ClientAuthTest) {
SSLClientAuthTestDelegate d;
{
- URLRequest r(test_server.GetURL(""), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server.GetURL(""), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -1967,8 +1935,8 @@ TEST_F(HTTPSRequestTest, ResumeTest) {
{
TestDelegate d;
- URLRequest r(test_server.GetURL("ssl-session-cache"), &d);
- r.set_context(&default_context_);
+ URLRequest r(
+ test_server.GetURL("ssl-session-cache"), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -1983,8 +1951,8 @@ TEST_F(HTTPSRequestTest, ResumeTest) {
{
TestDelegate d;
- URLRequest r(test_server.GetURL("ssl-session-cache"), &d);
- r.set_context(&default_context_);
+ URLRequest r(
+ test_server.GetURL("ssl-session-cache"), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -2034,8 +2002,8 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) {
{
TestDelegate d;
- URLRequest r(test_server.GetURL("ssl-session-cache"), &d);
- r.set_context(&default_context_);
+ URLRequest r(
+ test_server.GetURL("ssl-session-cache"), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -2065,8 +2033,8 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) {
{
TestDelegate d;
- URLRequest r(test_server.GetURL("ssl-session-cache"), &d);
- r.set_context(&default_context_);
+ URLRequest r(
+ test_server.GetURL("ssl-session-cache"), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -2103,8 +2071,7 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) {
TEST_F(URLRequestTestHTTP, CancelTest) {
TestDelegate d;
{
- URLRequest r(GURL("http://www.google.com/"), &d);
- r.set_context(&default_context_);
+ URLRequest r(GURL("http://www.google.com/"), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -2126,8 +2093,7 @@ TEST_F(URLRequestTestHTTP, CancelTest2) {
TestDelegate d;
{
- URLRequest r(test_server_.GetURL(""), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL(""), &d, &default_context_);
d.set_cancel_in_response_started(true);
@@ -2148,8 +2114,7 @@ TEST_F(URLRequestTestHTTP, CancelTest3) {
TestDelegate d;
{
- URLRequest r(test_server_.GetURL(""), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL(""), &d, &default_context_);
d.set_cancel_in_received_data(true);
@@ -2173,8 +2138,7 @@ TEST_F(URLRequestTestHTTP, CancelTest4) {
TestDelegate d;
{
- URLRequest r(test_server_.GetURL(""), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL(""), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -2200,8 +2164,7 @@ TEST_F(URLRequestTestHTTP, CancelTest5) {
// populate cache
{
TestDelegate d;
- URLRequest r(test_server_.GetURL("cachetime"), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("cachetime"), &d, &default_context_);
r.Start();
MessageLoop::current()->Run();
EXPECT_EQ(URLRequestStatus::SUCCESS, r.status().status());
@@ -2210,8 +2173,7 @@ TEST_F(URLRequestTestHTTP, CancelTest5) {
// cancel read from cache (see bug 990242)
{
TestDelegate d;
- URLRequest r(test_server_.GetURL("cachetime"), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("cachetime"), &d, &default_context_);
r.Start();
r.Cancel();
MessageLoop::current()->Run();
@@ -2238,8 +2200,7 @@ TEST_F(URLRequestTestHTTP, PostEmptyTest) {
TestDelegate d;
{
- URLRequest r(test_server_.GetURL("echo"), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("echo"), &d, &default_context_);
r.set_method("POST");
r.Start();
@@ -2260,8 +2221,7 @@ TEST_F(URLRequestTestHTTP, PostFileTest) {
TestDelegate d;
{
- URLRequest r(test_server_.GetURL("echo"), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("echo"), &d, &default_context_);
r.set_method("POST");
FilePath dir;
@@ -2314,8 +2274,7 @@ TEST_F(URLRequestTestHTTP, TestPostChunkedDataBeforeStart) {
TestDelegate d;
{
- URLRequest r(test_server_.GetURL("echo"), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("echo"), &d, &default_context_);
r.EnableChunkedUpload();
r.set_method("POST");
AddChunksToUpload(&r);
@@ -2333,8 +2292,7 @@ TEST_F(URLRequestTestHTTP, TestPostChunkedDataAfterStart) {
TestDelegate d;
{
- URLRequest r(test_server_.GetURL("echo"), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("echo"), &d, &default_context_);
r.EnableChunkedUpload();
r.set_method("POST");
r.Start();
@@ -2351,8 +2309,7 @@ TEST_F(URLRequestTestHTTP, TestPostChunkedDataAfterStart) {
TEST_F(URLRequestTest, AboutBlankTest) {
TestDelegate d;
{
- URLRequest r(GURL("about:blank"), &d);
- r.set_context(&default_context_);
+ URLRequest r(GURL("about:blank"), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -2391,8 +2348,8 @@ TEST_F(URLRequestTest, DataURLImageTest) {
"nlm2O34uI4b9tflqp1+QEFGzoW/ulmcofcpkZCYJhDfSpme7QcrHa+Xfji8paEQkTkSfm"
"moRWRNZr/F1KfVMjW+IKEnv2FwZfKdzt0BQR6lClcZR0EfEXEfv/G6W9iLiIyCoReV5En"
"hORIBHx+ufPj/gLB/zGI/G4Bk0AAAAASUVORK5CYII="),
- &d);
- r.set_context(&default_context_);
+ &d,
+ &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -2414,8 +2371,7 @@ TEST_F(URLRequestTest, FileTest) {
TestDelegate d;
{
- URLRequest r(app_url, &d);
- r.set_context(&default_context_);
+ URLRequest r(app_url, &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -2455,8 +2411,7 @@ TEST_F(URLRequestTest, FileTestFullSpecifiedRange) {
TestDelegate d;
{
- URLRequest r(temp_url, &d);
- r.set_context(&default_context_);
+ URLRequest r(temp_url, &d, &default_context_);
HttpRequestHeaders headers;
headers.SetHeader(HttpRequestHeaders::kRange,
@@ -2500,8 +2455,7 @@ TEST_F(URLRequestTest, FileTestHalfSpecifiedRange) {
TestDelegate d;
{
- URLRequest r(temp_url, &d);
- r.set_context(&default_context_);
+ URLRequest r(temp_url, &d, &default_context_);
HttpRequestHeaders headers;
headers.SetHeader(HttpRequestHeaders::kRange,
@@ -2538,8 +2492,7 @@ TEST_F(URLRequestTest, FileTestMultipleRanges) {
TestDelegate d;
{
- URLRequest r(temp_url, &d);
- r.set_context(&default_context_);
+ URLRequest r(temp_url, &d, &default_context_);
HttpRequestHeaders headers;
headers.SetHeader(HttpRequestHeaders::kRange,
@@ -2558,8 +2511,7 @@ TEST_F(URLRequestTest, FileTestMultipleRanges) {
TEST_F(URLRequestTest, InvalidUrlTest) {
TestDelegate d;
{
- URLRequest r(GURL("invalid url"), &d);
- r.set_context(&default_context_);
+ URLRequest r(GURL("invalid url"), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -2573,8 +2525,8 @@ TEST_F(URLRequestTestHTTP, ResponseHeadersTest) {
ASSERT_TRUE(test_server_.Start());
TestDelegate d;
- URLRequest req(test_server_.GetURL("files/with-headers.html"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server_.GetURL("files/with-headers.html"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -2635,8 +2587,7 @@ TEST_F(URLRequestTest, ResolveShortcutTest) {
TestDelegate d;
{
- URLRequest r(FilePathToFileURL(FilePath(lnk_path)), &d);
- r.set_context(&default_context_);
+ URLRequest r(FilePathToFileURL(FilePath(lnk_path)), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -2674,8 +2625,7 @@ TEST_F(URLRequestTestHTTP, ContentTypeNormalizationTest) {
TestDelegate d;
URLRequest req(test_server_.GetURL(
- "files/content-type-normalization.html"), &d);
- req.set_context(&default_context_);
+ "files/content-type-normalization.html"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -2700,8 +2650,7 @@ TEST_F(URLRequestTest, FileDirCancelTest) {
file_path = file_path.Append(FILE_PATH_LITERAL("net"));
file_path = file_path.Append(FILE_PATH_LITERAL("data"));
- URLRequest req(FilePathToFileURL(file_path), &d);
- req.set_context(&default_context_);
+ URLRequest req(FilePathToFileURL(file_path), &d, &default_context_);
req.Start();
EXPECT_TRUE(req.is_pending());
@@ -2726,8 +2675,7 @@ TEST_F(URLRequestTest, FileDirRedirectNoCrash) {
path = path.Append(FILE_PATH_LITERAL("url_request_unittest"));
TestDelegate d;
- URLRequest req(FilePathToFileURL(path), &d);
- req.set_context(&default_context_);
+ URLRequest req(FilePathToFileURL(path), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -2741,8 +2689,7 @@ TEST_F(URLRequestTest, FileDirRedirectNoCrash) {
// Don't accept the url "file:///" on windows. See http://crbug.com/1474.
TEST_F(URLRequestTest, FileDirRedirectSingleSlash) {
TestDelegate d;
- URLRequest req(GURL("file:///"), &d);
- req.set_context(&default_context_);
+ URLRequest req(GURL("file:///"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -2756,8 +2703,7 @@ TEST_F(URLRequestTestHTTP, RestrictRedirects) {
TestDelegate d;
URLRequest req(test_server_.GetURL(
- "files/redirect-to-file.html"), &d);
- req.set_context(&default_context_);
+ "files/redirect-to-file.html"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -2770,8 +2716,7 @@ TEST_F(URLRequestTestHTTP, RedirectToInvalidURL) {
TestDelegate d;
URLRequest req(test_server_.GetURL(
- "files/redirect-to-invalid-url.html"), &d);
- req.set_context(&default_context_);
+ "files/redirect-to-invalid-url.html"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -2783,8 +2728,8 @@ TEST_F(URLRequestTestHTTP, NoUserPassInReferrer) {
ASSERT_TRUE(test_server_.Start());
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?Referer"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server_.GetURL("echoheader?Referer"), &d, &default_context_);
req.set_referrer("http://user:pass@foo.com/");
req.Start();
MessageLoop::current()->Run();
@@ -2798,8 +2743,8 @@ TEST_F(URLRequestTestHTTP, CancelRedirect) {
TestDelegate d;
{
d.set_cancel_in_received_redirect(true);
- URLRequest req(test_server_.GetURL("files/redirect-test.html"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server_.GetURL("files/redirect-test.html"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -2816,8 +2761,8 @@ TEST_F(URLRequestTestHTTP, DeferredRedirect) {
TestDelegate d;
{
d.set_quit_on_redirect(true);
- URLRequest req(test_server_.GetURL("files/redirect-test.html"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server_.GetURL("files/redirect-test.html"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -2849,8 +2794,8 @@ TEST_F(URLRequestTestHTTP, CancelDeferredRedirect) {
TestDelegate d;
{
d.set_quit_on_redirect(true);
- URLRequest req(test_server_.GetURL("files/redirect-test.html"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server_.GetURL("files/redirect-test.html"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -2872,8 +2817,8 @@ TEST_F(URLRequestTestHTTP, VaryHeader) {
// populate the cache
{
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheadercache?foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server_.GetURL("echoheadercache?foo"), &d, &default_context_);
HttpRequestHeaders headers;
headers.SetHeader("foo", "1");
req.SetExtraRequestHeaders(headers);
@@ -2884,8 +2829,8 @@ TEST_F(URLRequestTestHTTP, VaryHeader) {
// expect a cache hit
{
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheadercache?foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server_.GetURL("echoheadercache?foo"), &d, &default_context_);
HttpRequestHeaders headers;
headers.SetHeader("foo", "1");
req.SetExtraRequestHeaders(headers);
@@ -2898,8 +2843,8 @@ TEST_F(URLRequestTestHTTP, VaryHeader) {
// expect a cache miss
{
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheadercache?foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server_.GetURL("echoheadercache?foo"), &d, &default_context_);
HttpRequestHeaders headers;
headers.SetHeader("foo", "2");
req.SetExtraRequestHeaders(headers);
@@ -2918,8 +2863,7 @@ TEST_F(URLRequestTestHTTP, BasicAuth) {
TestDelegate d;
d.set_credentials(AuthCredentials(kUser, kSecret));
- URLRequest r(test_server_.GetURL("auth-basic"), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("auth-basic"), &d, &default_context_);
r.Start();
MessageLoop::current()->Run();
@@ -2934,8 +2878,7 @@ TEST_F(URLRequestTestHTTP, BasicAuth) {
TestDelegate d;
d.set_credentials(AuthCredentials(kUser, kSecret));
- URLRequest r(test_server_.GetURL("auth-basic"), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("auth-basic"), &d, &default_context_);
r.set_load_flags(LOAD_VALIDATE_CACHE);
r.Start();
@@ -2967,8 +2910,7 @@ TEST_F(URLRequestTestHTTP, BasicAuthWithCookies) {
TestDelegate d;
d.set_credentials(AuthCredentials(kUser, kSecret));
- URLRequest r(url_requiring_auth, &d);
- r.set_context(&context);
+ URLRequest r(url_requiring_auth, &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -2997,8 +2939,7 @@ TEST_F(URLRequestTestHTTP, BasicAuthWithCookies) {
replacements.SetPasswordStr(password);
GURL url_with_identity = url_requiring_auth.ReplaceComponents(replacements);
- URLRequest r(url_with_identity, &d);
- r.set_context(&context);
+ URLRequest r(url_with_identity, &d, &context);
r.Start();
MessageLoop::current()->Run();
@@ -3026,8 +2967,8 @@ TEST_F(URLRequestTest, DelayedCookieCallback) {
TestNetworkDelegate network_delegate;
context.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
- req.set_context(&context);
+ URLRequest req(
+ test_server.GetURL("set-cookie?CookieToNotSend=1"), &d, &context);
req.Start();
MessageLoop::current()->Run();
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count());
@@ -3040,8 +2981,7 @@ TEST_F(URLRequestTest, DelayedCookieCallback) {
TestNetworkDelegate network_delegate;
context.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
- req.set_context(&context);
+ URLRequest req(test_server.GetURL("echoheader?Cookie"), &d, &context);
req.Start();
MessageLoop::current()->Run();
@@ -3061,8 +3001,9 @@ TEST_F(URLRequestTest, DoNotSendCookies) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"),
+ &d,
+ &default_context_);
req.Start();
MessageLoop::current()->Run();
EXPECT_EQ(0, network_delegate.blocked_get_cookies_count());
@@ -3074,8 +3015,8 @@ TEST_F(URLRequestTest, DoNotSendCookies) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL("echoheader?Cookie"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3090,9 +3031,9 @@ TEST_F(URLRequestTest, DoNotSendCookies) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
+ URLRequest req(
+ test_server.GetURL("echoheader?Cookie"), &d, &default_context_);
req.set_load_flags(LOAD_DO_NOT_SEND_COOKIES);
- req.set_context(&default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3114,8 +3055,9 @@ TEST_F(URLRequestTest, DoNotSaveCookies) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"),
+ &d,
+ &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3129,10 +3071,11 @@ TEST_F(URLRequestTest, DoNotSaveCookies) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL(
- "set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
+ URLRequest req(
+ test_server.GetURL("set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"),
+ &d,
+ &default_context_);
req.set_load_flags(LOAD_DO_NOT_SAVE_COOKIES);
- req.set_context(&default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3148,8 +3091,8 @@ TEST_F(URLRequestTest, DoNotSaveCookies) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL("echoheader?Cookie"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3173,8 +3116,9 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"),
+ &d,
+ &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3187,8 +3131,8 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL("echoheader?Cookie"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3205,8 +3149,8 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy) {
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
network_delegate.set_cookie_options(TestNetworkDelegate::NO_GET_COOKIES);
- URLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL("echoheader?Cookie"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3227,8 +3171,9 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"),
+ &d,
+ &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3242,9 +3187,10 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) {
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
network_delegate.set_cookie_options(TestNetworkDelegate::NO_SET_COOKIE);
- URLRequest req(test_server.GetURL(
- "set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL("set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"),
+ &d,
+ &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3258,8 +3204,8 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL("echoheader?Cookie"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3282,8 +3228,7 @@ TEST_F(URLRequestTest, DoNotSaveEmptyCookies) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server.GetURL("set-cookie"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3302,8 +3247,9 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server.GetURL("set-cookie?CookieToNotSend=1"),
+ &d,
+ &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3316,8 +3262,8 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL("echoheader?Cookie"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3334,8 +3280,8 @@ TEST_F(URLRequestTest, DoNotSendCookies_ViaPolicy_Async) {
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
network_delegate.set_cookie_options(TestNetworkDelegate::NO_GET_COOKIES);
- URLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL("echoheader?Cookie"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3356,8 +3302,9 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server.GetURL("set-cookie?CookieToNotUpdate=2"),
+ &d,
+ &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3371,9 +3318,10 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) {
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
network_delegate.set_cookie_options(TestNetworkDelegate::NO_SET_COOKIE);
- URLRequest req(test_server.GetURL(
- "set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL("set-cookie?CookieToNotSave=1&CookieToNotUpdate=1"),
+ &d,
+ &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3387,8 +3335,8 @@ TEST_F(URLRequestTest, DoNotSaveCookies_ViaPolicy_Async) {
TestNetworkDelegate network_delegate;
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
- URLRequest req(test_server.GetURL("echoheader?Cookie"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL("echoheader?Cookie"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
@@ -3419,9 +3367,11 @@ TEST_F(URLRequestTest, CookiePolicy_ForceSession) {
default_context_.set_network_delegate(&network_delegate);
TestDelegate d;
network_delegate.set_cookie_options(TestNetworkDelegate::FORCE_SESSION);
- URLRequest req(test_server.GetURL(
- "set-cookie?A=1;expires=\"Fri, 05 Feb 2010 23:42:01 GMT\""), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL(
+ "set-cookie?A=1;expires=\"Fri, 05 Feb 2010 23:42:01 GMT\""),
+ &d,
+ &default_context_);
req.Start(); // Triggers an asynchronous cookie policy check.
MessageLoop::current()->Run();
@@ -3449,8 +3399,8 @@ TEST_F(URLRequestTestHTTP, Post302RedirectGet) {
const char kData[] = "hello world";
TestDelegate d;
- URLRequest req(test_server_.GetURL("files/redirect-to-echoall"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server_.GetURL("files/redirect-to-echoall"), &d, &default_context_);
req.set_method("POST");
req.set_upload(CreateSimpleUploadData(kData));
@@ -3536,8 +3486,7 @@ TEST_F(URLRequestTestHTTP, InterceptPost302RedirectGet) {
const char kData[] = "hello world";
TestDelegate d;
- URLRequest req(test_server_.GetURL("empty.html"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server_.GetURL("empty.html"), &d, &default_context_);
req.set_method("POST");
req.set_upload(CreateSimpleUploadData(kData).get());
HttpRequestHeaders headers;
@@ -3560,8 +3509,7 @@ TEST_F(URLRequestTestHTTP, InterceptPost307RedirectPost) {
const char kData[] = "hello world";
TestDelegate d;
- URLRequest req(test_server_.GetURL("empty.html"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server_.GetURL("empty.html"), &d, &default_context_);
req.set_method("POST");
req.set_upload(CreateSimpleUploadData(kData).get());
HttpRequestHeaders headers;
@@ -3780,8 +3728,7 @@ TEST_F(URLRequestTest, Intercept) {
interceptor.main_data_ = TestInterceptor::ok_data();
TestDelegate d;
- URLRequest req(GURL("http://test_intercept/foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_);
base::SupportsUserData::Data* user_data0 = new base::SupportsUserData::Data();
base::SupportsUserData::Data* user_data1 = new base::SupportsUserData::Data();
base::SupportsUserData::Data* user_data2 = new base::SupportsUserData::Data();
@@ -3822,8 +3769,7 @@ TEST_F(URLRequestTest, InterceptRedirect) {
interceptor.redirect_data_ = TestInterceptor::ok_data();
TestDelegate d;
- URLRequest req(GURL("http://test_intercept/foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_);
req.set_method("GET");
req.Start();
MessageLoop::current()->Run();
@@ -3856,8 +3802,7 @@ TEST_F(URLRequestTest, InterceptServerError) {
interceptor.final_data_ = TestInterceptor::ok_data();
TestDelegate d;
- URLRequest req(GURL("http://test_intercept/foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_);
req.set_method("GET");
req.Start();
MessageLoop::current()->Run();
@@ -3886,8 +3831,7 @@ TEST_F(URLRequestTest, InterceptNetworkError) {
interceptor.final_data_ = TestInterceptor::ok_data();
TestDelegate d;
- URLRequest req(GURL("http://test_intercept/foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_);
req.set_method("GET");
req.Start();
MessageLoop::current()->Run();
@@ -3916,8 +3860,7 @@ TEST_F(URLRequestTest, InterceptRestartRequired) {
interceptor.main_data_ = TestInterceptor::ok_data();
TestDelegate d;
- URLRequest req(GURL("http://test_intercept/foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_);
req.set_method("GET");
req.Start();
MessageLoop::current()->Run();
@@ -3948,8 +3891,7 @@ TEST_F(URLRequestTest, InterceptRespectsCancelMain) {
interceptor.final_data_ = TestInterceptor::ok_data();
TestDelegate d;
- URLRequest req(GURL("http://test_intercept/foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_);
req.set_method("GET");
req.Start();
MessageLoop::current()->Run();
@@ -3980,8 +3922,7 @@ TEST_F(URLRequestTest, InterceptRespectsCancelRedirect) {
interceptor.final_data_ = TestInterceptor::ok_data();
TestDelegate d;
- URLRequest req(GURL("http://test_intercept/foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_);
req.set_method("GET");
req.Start();
MessageLoop::current()->Run();
@@ -4006,8 +3947,7 @@ TEST_F(URLRequestTest, InterceptRespectsCancelFinal) {
interceptor.cancel_final_request_ = true;
TestDelegate d;
- URLRequest req(GURL("http://test_intercept/foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_);
req.set_method("GET");
req.Start();
MessageLoop::current()->Run();
@@ -4033,8 +3973,7 @@ TEST_F(URLRequestTest, InterceptRespectsCancelInRestart) {
interceptor.final_data_ = TestInterceptor::ok_data();
TestDelegate d;
- URLRequest req(GURL("http://test_intercept/foo"), &d);
- req.set_context(&default_context_);
+ URLRequest req(GURL("http://test_intercept/foo"), &d, &default_context_);
req.set_method("GET");
req.Start();
MessageLoop::current()->Run();
@@ -4051,8 +3990,9 @@ TEST_F(URLRequestTest, InterceptRespectsCancelInRestart) {
// Check that two different URL requests have different identifiers.
TEST_F(URLRequestTest, Identifiers) {
TestDelegate d;
- TestURLRequest req(GURL("http://example.com"), &d);
- TestURLRequest other_req(GURL("http://example.com"), &d);
+ TestURLRequestContext context;
+ TestURLRequest req(GURL("http://example.com"), &d, &context);
+ TestURLRequest other_req(GURL("http://example.com"), &d, &context);
ASSERT_NE(req.identifier(), other_req.identifier());
}
@@ -4067,8 +4007,7 @@ TEST_F(URLRequestTest, NetworkDelegateProxyError) {
TestURLRequestContextWithProxy context("myproxy:70", &network_delegate);
TestDelegate d;
- URLRequest req(GURL("http://example.com"), &d);
- req.set_context(&context);
+ URLRequest req(GURL("http://example.com"), &d, &context);
req.set_method("GET");
req.Start();
@@ -4094,9 +4033,9 @@ TEST_F(URLRequestTest, DoNotOverrideReferrer) {
// only the latter shall be respected.
{
TestDelegate d;
- URLRequest req(test_server.GetURL("echoheader?Referer"), &d);
+ URLRequest req(
+ test_server.GetURL("echoheader?Referer"), &d, &default_context_);
req.set_referrer("http://foo.com/");
- req.set_context(&default_context_);
HttpRequestHeaders headers;
headers.SetHeader(HttpRequestHeaders::kReferer, "http://bar.com/");
@@ -4112,8 +4051,8 @@ TEST_F(URLRequestTest, DoNotOverrideReferrer) {
// shall be sent in the header.
{
TestDelegate d;
- URLRequest req(test_server.GetURL("echoheader?Referer"), &d);
- req.set_context(&default_context_);
+ URLRequest req(
+ test_server.GetURL("echoheader?Referer"), &d, &default_context_);
HttpRequestHeaders headers;
headers.SetHeader(HttpRequestHeaders::kReferer, "http://bar.com/");
@@ -4131,8 +4070,7 @@ TEST_F(URLRequestTest, DoNotOverrideReferrer) {
// content is empty.
TEST_F(URLRequestTest, RequestCompletionForEmptyResponse) {
TestDelegate d;
- URLRequest req(GURL("data:,"), &d);
- req.set_context(&default_context_);
+ URLRequest req(GURL("data:,"), &d, &default_context_);
req.Start();
MessageLoop::current()->Run();
EXPECT_EQ("", d.data_received());
@@ -4155,8 +4093,7 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPDirectoryListing) {
TestDelegate d;
{
- URLRequest r(test_server_.GetURL("/"), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("/"), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -4182,8 +4119,7 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPGetTestAnonymous) {
app_path = app_path.AppendASCII("LICENSE");
TestDelegate d;
{
- URLRequest r(test_server_.GetURL("/LICENSE"), &d);
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("/LICENSE"), &d, &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -4214,8 +4150,8 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPGetTest) {
{
URLRequest r(
test_server_.GetURLWithUserAndPassword("/LICENSE", "chrome", "chrome"),
- &d);
- r.set_context(&default_context_);
+ &d,
+ &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -4248,8 +4184,8 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongPassword) {
test_server_.GetURLWithUserAndPassword("/LICENSE",
"chrome",
"wrong_password"),
- &d);
- r.set_context(&default_context_);
+ &d,
+ &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -4281,8 +4217,8 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongPasswordRestart) {
test_server_.GetURLWithUserAndPassword("/LICENSE",
"chrome",
"wrong_password"),
- &d);
- r.set_context(&default_context_);
+ &d,
+ &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -4311,8 +4247,8 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongUser) {
test_server_.GetURLWithUserAndPassword("/LICENSE",
"wrong_user",
"chrome"),
- &d);
- r.set_context(&default_context_);
+ &d,
+ &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -4344,8 +4280,8 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCheckWrongUserRestart) {
test_server_.GetURLWithUserAndPassword("/LICENSE",
"wrong_user",
"chrome"),
- &d);
- r.set_context(&default_context_);
+ &d,
+ &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -4376,8 +4312,8 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheURLCredentials) {
test_server_.GetURLWithUserAndPassword("/LICENSE",
"chrome",
"chrome"),
- d.get());
- r.set_context(&default_context_);
+ d.get(),
+ &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -4395,8 +4331,7 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheURLCredentials) {
d.reset(new TestDelegate);
{
// This request should use cached identity from previous request.
- URLRequest r(test_server_.GetURL("/LICENSE"), d.get());
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("/LICENSE"), d.get(), &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -4429,8 +4364,8 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheLoginBoxCredentials) {
test_server_.GetURLWithUserAndPassword("/LICENSE",
"chrome",
"wrong_password"),
- d.get());
- r.set_context(&default_context_);
+ d.get(),
+ &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -4451,8 +4386,7 @@ TEST_F(URLRequestTestFTP, DISABLED_FTPCacheLoginBoxCredentials) {
{
// Don't pass wrong credentials in the URL, they would override valid cached
// ones.
- URLRequest r(test_server_.GetURL("/LICENSE"), d.get());
- r.set_context(&default_context_);
+ URLRequest r(test_server_.GetURL("/LICENSE"), d.get(), &default_context_);
r.Start();
EXPECT_TRUE(r.is_pending());
@@ -4479,8 +4413,8 @@ TEST_F(URLRequestTestHTTP, DefaultAcceptLanguage) {
context.Init();
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?Accept-Language"), &d);
- req.set_context(&context);
+ URLRequest req(
+ test_server_.GetURL("echoheader?Accept-Language"), &d, &context);
req.Start();
MessageLoop::current()->Run();
EXPECT_EQ("en", d.data_received());
@@ -4499,8 +4433,8 @@ TEST_F(URLRequestTestHTTP, EmptyAcceptLanguage) {
context.set_accept_language("");
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?Accept-Language"), &d);
- req.set_context(&context);
+ URLRequest req(
+ test_server_.GetURL("echoheader?Accept-Language"), &d, &context);
req.Start();
MessageLoop::current()->Run();
EXPECT_EQ("None", d.data_received());
@@ -4512,8 +4446,9 @@ TEST_F(URLRequestTestHTTP, OverrideAcceptLanguage) {
ASSERT_TRUE(test_server_.Start());
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?Accept-Language"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server_.GetURL("echoheader?Accept-Language"),
+ &d,
+ &default_context_);
HttpRequestHeaders headers;
headers.SetHeader(HttpRequestHeaders::kAcceptLanguage, "ru");
req.SetExtraRequestHeaders(headers);
@@ -4527,8 +4462,9 @@ TEST_F(URLRequestTestHTTP, DefaultAcceptEncoding) {
ASSERT_TRUE(test_server_.Start());
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?Accept-Encoding"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server_.GetURL("echoheader?Accept-Encoding"),
+ &d,
+ &default_context_);
HttpRequestHeaders headers;
req.SetExtraRequestHeaders(headers);
req.Start();
@@ -4542,8 +4478,9 @@ TEST_F(URLRequestTestHTTP, OverrideAcceptEncoding) {
ASSERT_TRUE(test_server_.Start());
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?Accept-Encoding"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server_.GetURL("echoheader?Accept-Encoding"),
+ &d,
+ &default_context_);
HttpRequestHeaders headers;
headers.SetHeader(HttpRequestHeaders::kAcceptEncoding, "identity");
req.SetExtraRequestHeaders(headers);
@@ -4564,8 +4501,9 @@ TEST_F(URLRequestTestHTTP, DefaultAcceptCharset) {
context.Init();
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"), &d);
- req.set_context(&context);
+ URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"),
+ &d,
+ &context);
req.Start();
MessageLoop::current()->Run();
EXPECT_EQ("en", d.data_received());
@@ -4584,8 +4522,9 @@ TEST_F(URLRequestTestHTTP, EmptyAcceptCharset) {
context.set_accept_charset("");
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"), &d);
- req.set_context(&context);
+ URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"),
+ &d,
+ &context);
req.Start();
MessageLoop::current()->Run();
EXPECT_EQ("None", d.data_received());
@@ -4597,8 +4536,9 @@ TEST_F(URLRequestTestHTTP, OverrideAcceptCharset) {
ASSERT_TRUE(test_server_.Start());
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server_.GetURL("echoheader?Accept-Charset"),
+ &d,
+ &default_context_);
HttpRequestHeaders headers;
headers.SetHeader(HttpRequestHeaders::kAcceptCharset, "koi-8r");
req.SetExtraRequestHeaders(headers);
@@ -4612,8 +4552,9 @@ TEST_F(URLRequestTestHTTP, DefaultUserAgent) {
ASSERT_TRUE(test_server_.Start());
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?User-Agent"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server_.GetURL("echoheader?User-Agent"),
+ &d,
+ &default_context_);
req.Start();
MessageLoop::current()->Run();
EXPECT_EQ(req.context()->GetUserAgent(req.url()), d.data_received());
@@ -4625,8 +4566,9 @@ TEST_F(URLRequestTestHTTP, OverrideUserAgent) {
ASSERT_TRUE(test_server_.Start());
TestDelegate d;
- URLRequest req(test_server_.GetURL("echoheader?User-Agent"), &d);
- req.set_context(&default_context_);
+ URLRequest req(test_server_.GetURL("echoheader?User-Agent"),
+ &d,
+ &default_context_);
HttpRequestHeaders headers;
headers.SetHeader(HttpRequestHeaders::kUserAgent, "Lynx (textmode)");
req.SetExtraRequestHeaders(headers);
« net/url_request/url_request.cc ('K') | « net/url_request/url_request_throttler_unittest.cc ('k') | remoting/host/url_fetcher.cc » ('j') | webkit/appcache/appcache_request_handler_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698