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/prefs | |
| 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/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 3307aa1..fc9343e 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -27,7 +27,7 @@ #include "chrome/browser/metrics/metrics_log.h" #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/net/net_pref_observer.h" -#include "chrome/browser/net/predictor_api.h" +#include "chrome/browser/net/predictor.h" #include "chrome/browser/net/pref_proxy_config_service.h" #include "chrome/browser/net/ssl_config_service_manager.h" #include "chrome/browser/notifications/desktop_notification_service.h" @@ -145,7 +145,7 @@ void RegisterUserPrefs(PrefService* user_prefs) { BookmarkModel::RegisterUserPrefs(user_prefs); Browser::RegisterUserPrefs(user_prefs); PasswordManager::RegisterUserPrefs(user_prefs); - chrome_browser_net::RegisterUserPrefs(user_prefs); + chrome_browser_net::Predictor::RegisterUserPrefs(user_prefs); DownloadPrefs::RegisterUserPrefs(user_prefs); bookmark_utils::RegisterUserPrefs(user_prefs); TabContentsWrapper::RegisterUserPrefs(user_prefs); |