summaryrefslogtreecommitdiffstats
path: root/content/browser/streams
diff options
context:
space:
mode:
authortburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 17:55:16 +0000
committertburkard@chromium.org <tburkard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 17:55:16 +0000
commita96f4c5795e7cf0d2778a3d77316614de6fcba69 (patch)
tree88e5448c6a50f9f83b478751682d3f9930f47aa2 /content/browser/streams
parent8a76c8f5fc87008d0b14877076b83d29b35b1846 (diff)
downloadchromium_src-a96f4c5795e7cf0d2778a3d77316614de6fcba69.zip
chromium_src-a96f4c5795e7cf0d2778a3d77316614de6fcba69.tar.gz
chromium_src-a96f4c5795e7cf0d2778a3d77316614de6fcba69.tar.bz2
Allow the content browser client to specify a special cookie store to be
used for a given render process id. This special cookie store will then be used for renderer messages pertaining to cookies, url fetches in net, and websockets. If the special cookie store is NULL, a default cookie store will be used. R=erikwright@chromium.org, jam@chromium.org, lambroslambrou@chromium.org, mmenke@chromium.org, tyoshino@chromium.org Review URL: https://codereview.chromium.org/188693003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/streams')
-rw-r--r--content/browser/streams/stream_url_request_job_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/streams/stream_url_request_job_unittest.cc b/content/browser/streams/stream_url_request_job_unittest.cc
index 9caf684..035a588 100644
--- a/content/browser/streams/stream_url_request_job_unittest.cc
+++ b/content/browser/streams/stream_url_request_job_unittest.cc
@@ -76,7 +76,7 @@ class StreamURLRequestJobTest : public testing::Test {
const std::string& expected_response) {
net::TestDelegate delegate;
request_ = url_request_context_.CreateRequest(
- url, net::DEFAULT_PRIORITY, &delegate);
+ url, net::DEFAULT_PRIORITY, &delegate, NULL);
request_->set_method(method);
if (!extra_headers.IsEmpty())
request_->SetExtraRequestHeaders(extra_headers);
@@ -134,7 +134,7 @@ TEST_F(StreamURLRequestJobTest, TestGetLargeStreamRequest) {
TEST_F(StreamURLRequestJobTest, TestGetNonExistentStreamRequest) {
net::TestDelegate delegate;
request_ = url_request_context_.CreateRequest(
- kStreamURL, net::DEFAULT_PRIORITY, &delegate);
+ kStreamURL, net::DEFAULT_PRIORITY, &delegate, NULL);
request_->set_method("GET");
request_->Start();