Allow dynamic updating of authentication policies

chrome/browser/io_thread.h

Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index f57bc395a0eb16e6b0e6966ac96c5461a152ea8d..1f4cb5c668491ec03709619b3d3925bcfd4c2d9d 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -24,6 +24,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_thread_delegate.h"
 #include "net/base/network_change_notifier.h"
+#include "net/http/http_auth_preferences.h"
 #include "net/http/http_network_session.h"
 #include "net/socket/next_proto.h"
 
@@ -61,7 +62,7 @@ class CTVerifier;
 class FtpTransactionFactory;
 class HostMappingRules;
 class HostResolver;
-class HttpAuthHandlerFactory;
+class HttpAuthHandlerRegistryFactory;
 class HttpNetworkSession;
 class HttpServerProperties;
 class HttpTransactionFactory;
@@ -76,7 +77,6 @@ class URLRequestBackoffManager;
 class URLRequestContext;
 class URLRequestContextGetter;
 class URLRequestJobFactory;
-class URLSecurityManager;
 }  // namespace net
 
 namespace net_log {
@@ -157,7 +157,6 @@ class IOThread : public content::BrowserThreadDelegate {
     scoped_ptr<net::URLRequestJobFactory>
         proxy_script_fetcher_url_request_job_factory;
     scoped_ptr<net::URLRequestBackoffManager> url_request_backoff_manager;
-    scoped_ptr<net::URLSecurityManager> url_security_manager;
     // TODO(willchan): Remove proxy script fetcher context since it's not
     // necessary now that I got rid of refcounting URLRequestContexts.
     //
@@ -320,8 +319,7 @@ chrome::android::ExternalDataUseObserver* external_data_use_observer() const {
   // 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();
@@ -329,6 +327,11 @@ chrome::android::ExternalDataUseObserver* external_data_use_observer() const {
   void ChangedToOnTheRecordOnIOThread();
 
   void UpdateDnsClientEnabled();
+  void UpdateServerWhitelist();
+  void UpdateDelegateWhitelist();
+  void UpdateAndroidAuthNegotiateAccountType();
+  void UpdateNegotiateDisableCnameLookup();
+  void UpdateNegotiateEnablePort();
 
   // Configures QUIC options based on the flags in |command_line| as
   // well as the QUIC field trial group.
@@ -504,14 +507,7 @@ chrome::android::ExternalDataUseObserver* external_data_use_observer() const {
 
   BooleanPrefMember quick_check_enabled_;
 
-  // Store HTTP Auth-related policies in this thread.
-  std::string auth_schemes_;
-  bool negotiate_disable_cname_lookup_;
-  bool negotiate_enable_port_;
-  std::string auth_server_whitelist_;
-  std::string auth_delegate_whitelist_;
-  std::string gssapi_library_name_;
-  std::string auth_android_negotiate_account_type_;
+  net::HttpAuthPreferences http_auth_preferences_;
 
   // This is an instance of the default SSLConfigServiceManager for the current
   // platform and it gets SSL preferences from local_state object.