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

1 files changed, 7 insertions, 1 deletions

diff --git a/chrome/browser/net/net_pref_observer.h b/chrome/browser/net/net_pref_observer.h
index b7b60c0..4d2ca47 100644
--- a/chrome/browser/net/net_pref_observer.h
+++ b/chrome/browser/net/net_pref_observer.h
@@ -14,6 +14,10 @@
 
 class Profile;
 
+namespace chrome_browser_net {
+class Predictor;
+}
+
 namespace prerender {
 class PrerenderManager;
 }
@@ -27,7 +31,8 @@ class NetPrefObserver : public NotificationObserver {
   // |prerender_manager| may be NULL. If not, |*prerender_manager| must
   // outlive this.
   NetPrefObserver(PrefService* prefs,
-                  prerender::PrerenderManager* prerender_manager);
+                  prerender::PrerenderManager* prerender_manager,
+                  chrome_browser_net::Predictor* predictor);
   virtual ~NetPrefObserver();
 
   // NotificationObserver
@@ -45,6 +50,7 @@ class NetPrefObserver : public NotificationObserver {
   BooleanPrefMember spdy_disabled_;
   BooleanPrefMember http_throttling_enabled_;
   prerender::PrerenderManager* prerender_manager_;
+  chrome_browser_net::Predictor* predictor_;
 
   DISALLOW_COPY_AND_ASSIGN(NetPrefObserver);
 };