| Index: chrome/browser/io_thread.h
|
| diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
|
| index 2d798f6f8206fe9797948dbc6d0e698108c237d5..0407154895cf1f92b8085c172969e2984d8ce4ec 100644
|
| --- a/chrome/browser/io_thread.h
|
| +++ b/chrome/browser/io_thread.h
|
| @@ -53,7 +53,7 @@ class CTVerifier;
|
| class FtpTransactionFactory;
|
| class HostMappingRules;
|
| class HostResolver;
|
| -class HttpAuthHandlerFactory;
|
| +class HttpAuthHandlerRegistryFactory;
|
| class HttpNetworkSession;
|
| class HttpServerProperties;
|
| class HttpTransactionFactory;
|
| @@ -137,7 +137,7 @@ class IOThread : public content::BrowserThreadDelegate {
|
| scoped_ptr<net::CTVerifier> cert_transparency_verifier;
|
| scoped_ptr<net::CertPolicyEnforcer> cert_policy_enforcer;
|
| scoped_refptr<net::SSLConfigService> ssl_config_service;
|
| - scoped_ptr<net::HttpAuthHandlerFactory> http_auth_handler_factory;
|
| + scoped_ptr<net::HttpAuthHandlerRegistryFactory> http_auth_handler_factory;
|
| scoped_ptr<net::HttpServerProperties> http_server_properties;
|
| scoped_ptr<net::ProxyService> proxy_script_fetcher_proxy_service;
|
| scoped_ptr<net::HttpNetworkSession>
|
| @@ -300,8 +300,7 @@ class IOThread : public content::BrowserThreadDelegate {
|
| // 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();
|
| @@ -309,6 +308,10 @@ class IOThread : public content::BrowserThreadDelegate {
|
| void ChangedToOnTheRecordOnIOThread();
|
|
|
| void UpdateDnsClientEnabled();
|
| + void UpdateSecurityManager();
|
| + void UpdateAndroidAuthNegotiateAccount();
|
| + void UpdateNegotiateDisableCnameLookup();
|
| + void UpdateNegotiateEnablePort();
|
|
|
| // Configures QUIC options based on the flags in |command_line| as
|
| // well as the QUIC field trial group.
|
| @@ -486,13 +489,19 @@ class IOThread : public content::BrowserThreadDelegate {
|
| BooleanPrefMember quick_check_enabled_;
|
|
|
| // Store HTTP Auth-related policies in this thread.
|
| + // TODO(aberent) Make the list of auth schemes a PrefMember, so that the
|
| + // policy can change after startup.
|
| std::string auth_schemes_;
|
| - bool negotiate_disable_cname_lookup_;
|
| - bool negotiate_enable_port_;
|
| - std::string auth_server_whitelist_;
|
| - std::string auth_delegate_whitelist_;
|
| + BooleanPrefMember negotiate_disable_cname_lookup_;
|
| + BooleanPrefMember negotiate_enable_port_;
|
| + StringPrefMember auth_server_whitelist_;
|
| + StringPrefMember auth_delegate_whitelist_;
|
| +
|
| + // No PrefMember for the GSSAPI library name, since changing it after startup
|
| + // requires unloading the existing GSSAPI library, which could cause all sorts
|
| + // of problems for, for example, active Negotiate transactions.
|
| std::string gssapi_library_name_;
|
| - std::string auth_android_negotiate_account_type_;
|
| + StringPrefMember auth_android_negotiate_account_type_;
|
|
|
| // This is an instance of the default SSLConfigServiceManager for the current
|
| // platform and it gets SSL preferences from local_state object.
|
|
|