diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 21:23:06 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-12 21:23:06 +0000 |
| commit | 5e501de8433bd127e0a5bf40b43d7396228d14a0 (patch) | |
| tree | 478e22369cc29c8cd7948a08556d7dc5c51cd42a /chrome/browser/net/chrome_network_delegate.cc | |
| parent | ea0166624be8d9f54db91cb2cbe96429ba9cbc77 (diff) | |
| download | chromium_src-5e501de8433bd127e0a5bf40b43d7396228d14a0.zip chromium_src-5e501de8433bd127e0a5bf40b43d7396228d14a0.tar.gz chromium_src-5e501de8433bd127e0a5bf40b43d7396228d14a0.tar.bz2 | |
Revert 269855 "Only commit cookie changes in prerenders after a ..."
This broke again - http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac%2010.7%20Tests%20%28dbg%29%281%29&number=23472
> Only commit cookie changes in prerenders after a prerender is shown
> Will create a PrerenderCookieStore for each prerender, retaining all cookie
> operations of a prerender until the prerender is shown to the user.
> Forces prerenders to be in a new render process by themselves for this to work.
> BUG=371003
>
> This is a resubmission of https://codereview.chromium.org/233353003, which had
> to be reverted due to build breaks. See LGTM's there.
>
> Review URL: https://codereview.chromium.org/278403003
TBR=tburkard@chromium.org
Review URL: https://codereview.chromium.org/280383002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269879 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/chrome_network_delegate.cc')
| -rw-r--r-- | chrome/browser/net/chrome_network_delegate.cc | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index bafd11f..1cab93d 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -29,7 +29,6 @@ #include "chrome/browser/net/client_hints.h" #include "chrome/browser/net/connect_interceptor.h" #include "chrome/browser/performance_monitor/performance_monitor.h" -#include "chrome/browser/prerender/prerender_tracker.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/common/pref_names.h" @@ -53,7 +52,6 @@ #include "net/http/http_response_headers.h" #include "net/socket_stream/socket_stream.h" #include "net/url_request/url_request.h" -#include "net/url_request/url_request_context.h" #if defined(OS_CHROMEOS) #include "base/command_line.h" @@ -360,8 +358,7 @@ ChromeNetworkDelegate::ChromeNetworkDelegate( domain_reliability_monitor_(NULL), received_content_length_(0), original_content_length_(0), - first_request_(true), - prerender_tracker_(NULL) { + first_request_(true) { DCHECK(event_router); DCHECK(enable_referrers); } @@ -745,13 +742,6 @@ bool ChromeNetworkDelegate::OnCanSetCookie(const net::URLRequest& request, cookie_line, *options, !allow)); } - if (prerender_tracker_) { - prerender_tracker_->OnCookieChangedForURL( - render_process_id, - request.context()->cookie_store()->GetCookieMonster(), - request.url()); - } - return allow; } |