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/profiles/profile_io_data.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/profiles/profile_io_data.cc')
| -rw-r--r-- | chrome/browser/profiles/profile_io_data.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 9a4234f..ba8b91e 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -366,7 +366,6 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) { #endif params->profile = profile; - params->prerender_tracker = g_browser_process->prerender_tracker(); profile_params_.reset(params.release()); ChromeNetworkDelegate::InitializePrefsOnUIThread( @@ -949,7 +948,6 @@ void ProfileIOData::Init( network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); network_delegate->set_enable_do_not_track(&enable_do_not_track_); network_delegate->set_force_google_safe_search(&force_safesearch_); - network_delegate->set_prerender_tracker(profile_params_->prerender_tracker); network_delegate_.reset(network_delegate); fraudulent_certificate_reporter_.reset( |