Modifying prefetch to account for multi-profile.

chrome/browser/io_thread.h

Index: chrome/browser/io_thread.h
===================================================================
--- chrome/browser/io_thread.h	(revision 96009)
+++ chrome/browser/io_thread.h	(working copy)
@@ -14,6 +14,7 @@
 #include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/net/ssl_config_service_manager.h"
 #include "chrome/browser/prefs/pref_member.h"
+#include "chrome/browser/profiles/profile.h"

[willchan no longer on Chromium, 2011/08/10 16:10:35]

I don't think this needs to be here.

[rpetterson, 2011/08/12 03:12:36]

Done.

 #include "chrome/common/net/predictor_common.h"
 #include "net/base/network_change_notifier.h"
 
@@ -30,7 +31,6 @@
 }
 
 namespace chrome_browser_net {
-class ConnectInterceptor;
 class Predictor;
 }  // namespace chrome_browser_net
 
@@ -109,23 +109,17 @@
   // prefetching should be enabled, and |preconnect_enabled| controls whether
   // TCP/IP preconnection is enabled.  This should be called by the UI thread.
   // It will post a task to the IO thread to perform the actual initialization.
-  void InitNetworkPredictor(bool prefetching_enabled,
-                            base::TimeDelta max_dns_queue_delay,
-                            size_t max_speculative_parallel_resolves,
-                            const chrome_common_net::UrlList& startup_urls,
+  void InitNetworkPredictor(const chrome_common_net::UrlList& startup_urls,
                             base::ListValue* referral_list,
-                            bool preconnect_enabled);
+                            chrome_browser_net::Predictor* predictor);

[jar (doing other things), 2011/08/16 01:19:09]

This method name is now confusing.  It appears that you pass in a predictor...
but the method suggests we initialize it.  IN the past, it really constructed
the essences of it (all statics).  Now presumably it will better populate the
|predictor| it is given.  That sure sounds like it should be a Predictor method.
 Alternatively, should this be a request for a construction of a Predictor? 

...or does the method name and comment need to change?

 
-  // Handles changing to On The Record mode, discarding confidential data.
-  void ChangedToOnTheRecord();
-
   // Returns a getter for the URLRequestContext.  Only called on the UI thread.
   net::URLRequestContextGetter* system_url_request_context_getter();
 
   // Clear all network stack history, including the host cache, as well as
   // speculative data about subresources of visited sites, and startup-time
   // navigations.
-  void ClearNetworkingHistory();
+  void ClearNetworkingHistory(chrome_browser_net::Predictor* predictor);
 
  protected:
   virtual void Init();
@@ -148,15 +142,10 @@
   void InitSystemRequestContextOnIOThread();
 
   void InitNetworkPredictorOnIOThread(
-      bool prefetching_enabled,
-      base::TimeDelta max_dns_queue_delay,
-      size_t max_speculative_parallel_resolves,
       const chrome_common_net::UrlList& startup_urls,
       base::ListValue* referral_list,
-      bool preconnect_enabled);
+      chrome_browser_net::Predictor* predictor);
 
-  void ChangedToOnTheRecordOnIOThread();
-
   // Clears the host cache.  Intended to be used to prevent exposing recently
   // visited sites on about:net-internals/#dns and about:dns pages.  Must be
   // called on the IO thread.
@@ -208,9 +197,6 @@
   // explicit about destruction order, and ensure that there is no chance that
   // these observers would be used accidentally after we have begun to tear
   // down.
-  chrome_browser_net::ConnectInterceptor* speculative_interceptor_;
-  chrome_browser_net::Predictor* predictor_;
-
   scoped_ptr<net::ProxyConfigService> system_proxy_config_service_;
 
   scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;