summaryrefslogtreecommitdiffstats
path: root/content/browser/loader/resource_loader_unittest.cc
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-21 16:32:19 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-21 16:34:06 +0000
commitf7022f35ef5ae2ce0aa7fbb5977b140ca1a2ab1c (patch)
treea7890ddc698cb75c4f86babfe3c4d34e23c67f29 /content/browser/loader/resource_loader_unittest.cc
parent4b04e3424d3a266d33d5f613cbfbbecd1bd5388a (diff)
downloadchromium_src-f7022f35ef5ae2ce0aa7fbb5977b140ca1a2ab1c.zip
chromium_src-f7022f35ef5ae2ce0aa7fbb5977b140ca1a2ab1c.tar.gz
chromium_src-f7022f35ef5ae2ce0aa7fbb5977b140ca1a2ab1c.tar.bz2
Allow URLRequests from one context to have different NetworkDelegates.
This is a prerequisite to allowing a URLRequestJob to transparently wrap a URLRequest, so AppCache can override the response for failing and redirected requests without the NetworkDelegate or URLRequest::Delegate being aware of the underlying request. Also consolidate the URLRequest constructors, and make most code create URLRequests through the URLRequestContext's CreateRequest function, rather than through its constructor. TBR=battre@chromium.org BUG=161547 Review URL: https://codereview.chromium.org/407093011 Cr-Commit-Position: refs/heads/master@{#291090} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/loader/resource_loader_unittest.cc')
-rw-r--r--content/browser/loader/resource_loader_unittest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/content/browser/loader/resource_loader_unittest.cc b/content/browser/loader/resource_loader_unittest.cc
index 1e489e8..23beced 100644
--- a/content/browser/loader/resource_loader_unittest.cc
+++ b/content/browser/loader/resource_loader_unittest.cc
@@ -313,10 +313,11 @@ class ResourceLoaderTest : public testing::Test,
const int kRenderViewId = 2;
scoped_ptr<net::URLRequest> request(
- new net::URLRequest(test_url(),
- net::DEFAULT_PRIORITY,
- NULL,
- resource_context_.GetRequestContext()));
+ resource_context_.GetRequestContext()->CreateRequest(
+ test_url(),
+ net::DEFAULT_PRIORITY,
+ NULL /* delegate */,
+ NULL /* cookie_store */));
raw_ptr_to_request_ = request.get();
ResourceRequestInfo::AllocateForTesting(request.get(),
RESOURCE_TYPE_MAIN_FRAME,