diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 16:02:50 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-19 16:02:50 +0000 |
| commit | b503914167a6274410f0e36f44f1f2e2ddf3ee32 (patch) | |
| tree | fd6ac7eb116c79814b327c8ecf468a4f290ac337 /chrome/browser/prefs | |
| parent | d237cec53e16749a35c6f9c0cc5920eed8eabb36 (diff) | |
| download | chromium_src-b503914167a6274410f0e36f44f1f2e2ddf3ee32.zip chromium_src-b503914167a6274410f0e36f44f1f2e2ddf3ee32.tar.gz chromium_src-b503914167a6274410f0e36f44f1f2e2ddf3ee32.tar.bz2 | |
Revert "Modifying prefetch to account for multi-profile."
This appears to make all the CF bots crash in chrome_frame_net_tests.
This reverts commit r97446.
BUG=89937
TEST=n/a
TBR=rlp
Review URL: http://codereview.chromium.org/7685009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97467 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 fc9343e..3307aa1 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.h" +#include "chrome/browser/net/predictor_api.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::Predictor::RegisterUserPrefs(user_prefs); + chrome_browser_net::RegisterUserPrefs(user_prefs); DownloadPrefs::RegisterUserPrefs(user_prefs); bookmark_utils::RegisterUserPrefs(user_prefs); TabContentsWrapper::RegisterUserPrefs(user_prefs); |