diff options
author | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 18:23:05 +0000 |
---|---|---|
committer | peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 18:23:05 +0000 |
commit | a8030a22c88436615550267e26b539382dd5fe8b (patch) | |
tree | d25b01d04058e18309329edef8cfb1d059690429 /net/url_request/url_request_http_job.cc | |
parent | 26ca33d393dbd3d3b8763d1659f906f52d2e0289 (diff) | |
download | chromium_src-a8030a22c88436615550267e26b539382dd5fe8b.zip chromium_src-a8030a22c88436615550267e26b539382dd5fe8b.tar.gz chromium_src-a8030a22c88436615550267e26b539382dd5fe8b.tar.bz2 |
Revert 256579 "Allow the content browser client to specify a spe..."
This broke the Android builders. The try-bots on the CL did point
out the compile errors, but it was committed manually anyway. Logs:
http://build.chromium.org/p/chromium.linux/builders/Android%20Clang%20Builder%20%28dbg%29/builds/30977/steps/compile/logs/stdio
> 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
TBR=tburkard@chromium.org
Review URL: https://codereview.chromium.org/197463003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_http_job.cc')
-rw-r--r-- | net/url_request/url_request_http_job.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 044e5f0..82ef633 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -539,7 +539,7 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() { if (!request_) return; - CookieStore* cookie_store = GetCookieStore(); + CookieStore* cookie_store = request_->context()->cookie_store(); if (cookie_store && !(request_info_.load_flags & LOAD_DO_NOT_SEND_COOKIES)) { net::CookieMonster* cookie_monster = cookie_store->GetCookieMonster(); if (cookie_monster) { @@ -558,7 +558,7 @@ void URLRequestHttpJob::AddCookieHeaderAndStart() { void URLRequestHttpJob::DoLoadCookies() { CookieOptions options; options.set_include_httponly(); - GetCookieStore()->GetCookiesWithOptionsAsync( + request_->context()->cookie_store()->GetCookiesWithOptionsAsync( request_->url(), options, base::Bind(&URLRequestHttpJob::OnCookiesLoaded, weak_factory_.GetWeakPtr())); @@ -638,7 +638,8 @@ void URLRequestHttpJob::SaveNextCookie() { new SharedBoolean(true); if (!(request_info_.load_flags & LOAD_DO_NOT_SAVE_COOKIES) && - GetCookieStore() && response_cookies_.size() > 0) { + request_->context()->cookie_store() && + response_cookies_.size() > 0) { CookieOptions options; options.set_include_httponly(); options.set_server_time(response_date_); @@ -656,7 +657,7 @@ void URLRequestHttpJob::SaveNextCookie() { if (CanSetCookie( response_cookies_[response_cookies_save_index_], &options)) { callback_pending->data = true; - GetCookieStore()->SetCookieWithOptionsAsync( + request_->context()->cookie_store()->SetCookieWithOptionsAsync( request_->url(), response_cookies_[response_cookies_save_index_], options, callback); } |