| Index: chrome/browser/io_thread.h
|
| ===================================================================
|
| --- chrome/browser/io_thread.h (revision 89645)
|
| +++ chrome/browser/io_thread.h (working copy)
|
| @@ -15,6 +15,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"
|
| #include "chrome/common/net/predictor_common.h"
|
| #include "net/base/network_change_notifier.h"
|
|
|
| @@ -27,7 +28,6 @@
|
| class SystemURLRequestContextGetter;
|
|
|
| namespace chrome_browser_net {
|
| -class ConnectInterceptor;
|
| class Predictor;
|
| } // namespace chrome_browser_net
|
|
|
| @@ -104,6 +104,7 @@
|
| size_t max_speculative_parallel_resolves,
|
| const chrome_common_net::UrlList& startup_urls,
|
| ListValue* referral_list,
|
| + Profile* profile,
|
| bool preconnect_enabled);
|
|
|
| // Registers |url_request_context_getter| into the IO thread. During
|
| @@ -122,7 +123,7 @@
|
| ChromeURLRequestContextGetter* url_request_context_getter);
|
|
|
| // Handles changing to On The Record mode, discarding confidential data.
|
| - void ChangedToOnTheRecord();
|
| + void ChangedToOnTheRecord(Profile* profile);
|
|
|
| // Returns a getter for the URLRequestContext. Only called on the UI thread.
|
| net::URLRequestContextGetter* system_url_request_context_getter();
|
| @@ -130,7 +131,7 @@
|
| // 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();
|
| @@ -158,9 +159,10 @@
|
| size_t max_speculative_parallel_resolves,
|
| const chrome_common_net::UrlList& startup_urls,
|
| ListValue* referral_list,
|
| - bool preconnect_enabled);
|
| + bool preconnect_enabled,
|
| + Profile* profile);
|
|
|
| - void ChangedToOnTheRecordOnIOThread();
|
| + void ChangedToOnTheRecordOnIOThread(Profile* profile);
|
|
|
| // 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
|
| @@ -213,9 +215,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_;
|
|
|