diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 15:50:52 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 15:50:52 +0000 |
| commit | d237cec53e16749a35c6f9c0cc5920eed8eabb36 (patch) | |
| tree | 93e5528922a8d639d01a5e188ca26971b98a25e9 /chrome/browser/browser_shutdown.cc | |
| parent | 9f07c9b7b32e68112ddca7968230e08293c2809c (diff) | |
| download | chromium_src-d237cec53e16749a35c6f9c0cc5920eed8eabb36.zip chromium_src-d237cec53e16749a35c6f9c0cc5920eed8eabb36.tar.gz chromium_src-d237cec53e16749a35c6f9c0cc5920eed8eabb36.tar.bz2 | |
Revert 97465 - Revert 97446 - Modifying prefetch to account for multi-profile.
Items of note:
- predictor_api is gone. Most functions in predictor_api.cc have moved into the chrome_browser_net::Predictor class or the Profile class.
- The predictor state is cleaned up in the Profile dtor.
- Predictor is owned by the ProfileIOData of the profile.
- InitialObserver class is gone since each profile keeps their own info, the non-OTR don't care if anyone is OTR.
- Predictor is created by the profile and then passed to the ProfileIOData. Then its initialization is finished on the IOThread.
- ConnectInterceptor now subclasses off of UrlRequestJobFactory::Interceptor.
- Updated Profile to create a SimpleShutdownPredictor with limited functionality when in unittests.
BUG=89937
TEST=passes existing
Review URL: http://codereview.chromium.org/7467012
TBR=rlp@chromium.org
Review URL: http://codereview.chromium.org/7690006
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/7688006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97466 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_shutdown.cc')
| -rw-r--r-- | chrome/browser/browser_shutdown.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index 92683fe..c18d22f 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -38,7 +38,6 @@ #include "content/browser/renderer_host/render_process_host.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/renderer_host/render_widget_host.h" -#include "net/predictor_api.h" #include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) @@ -140,10 +139,6 @@ void Shutdown() { // time to get here. If you have something that *must* happen on end session, // consider putting it in BrowserProcessImpl::EndSession. PrefService* prefs = g_browser_process->local_state(); - ProfileManager* profile_manager = g_browser_process->profile_manager(); - PrefService* user_prefs = profile_manager->GetDefaultProfile()->GetPrefs(); - - chrome_browser_net::SavePredictorStateForNextStartupAndTrim(user_prefs); MetricsService* metrics = g_browser_process->metrics_service(); if (metrics) |