Index: ios/chrome/browser/ios_chrome_io_thread.h |
diff --git a/ios/chrome/browser/ios_chrome_io_thread.h b/ios/chrome/browser/ios_chrome_io_thread.h |
index 3dfe1ea6f08936315940683a0c9352e0c081c60c..a0de49d31fd43808c4045f1bf159d9fcedc6d6fc 100644 |
--- a/ios/chrome/browser/ios_chrome_io_thread.h |
+++ b/ios/chrome/browser/ios_chrome_io_thread.h |
@@ -40,6 +40,7 @@ class CookieStore; |
class CTVerifier; |
class HostResolver; |
class HttpAuthHandlerFactory; |
+class HttpAuthPreferences; |
class HttpNetworkSession; |
class HttpServerProperties; |
class HttpTransactionFactory; |
@@ -54,7 +55,6 @@ class URLRequestBackoffManager; |
class URLRequestContext; |
class URLRequestContextGetter; |
class URLRequestJobFactory; |
-class URLSecurityManager; |
} // namespace net |
namespace net_log { |
@@ -118,7 +118,7 @@ class IOSChromeIOThread : public web::WebThreadDelegate { |
scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory; |
scoped_ptr<net::HttpServerProperties> http_server_properties; |
scoped_ptr<net::URLRequestBackoffManager> url_request_backoff_manager; |
- scoped_ptr<net::URLSecurityManager> url_security_manager; |
+ scoped_ptr<net::HttpAuthPreferences> http_auth_preferences; |
asanka
2015/12/01 05:30:03
Destruction order. http_auth_preferences above htt
aberent
2015/12/01 14:33:25
Done.
|
scoped_ptr<net::ProxyService> system_proxy_service; |
scoped_ptr<net::HttpNetworkSession> system_http_network_session; |
scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; |
@@ -242,8 +242,7 @@ class IOSChromeIOThread : public web::WebThreadDelegate { |
// SystemRequestContext state has been initialized on the UI thread. |
void InitSystemRequestContextOnIOThread(); |
- net::HttpAuthHandlerFactory* CreateDefaultAuthHandlerFactory( |
- net::HostResolver* resolver); |
+ void CreateDefaultAuthHandlerFactory(); |
// Returns an SSLConfigService instance. |
net::SSLConfigService* GetSSLConfigService(); |