Allow dynamic updating of authentication policies

android_webview/browser/net/aw_url_request_context_getter.h

Index: android_webview/browser/net/aw_url_request_context_getter.h
diff --git a/android_webview/browser/net/aw_url_request_context_getter.h b/android_webview/browser/net/aw_url_request_context_getter.h
index 06ddad5c63f2bb3bf9062351716a3c51945307a2..655d2ad0548ca07d8ff4c6ffc1ec037468acec54 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.h
+++ b/android_webview/browser/net/aw_url_request_context_getter.h
@@ -19,12 +19,12 @@ namespace net {
 class CookieStore;
 class HostResolver;
 class HttpAuthHandlerFactory;
+class HttpAuthPreferences;
 class HttpUserAgentSettings;
 class NetLog;
 class ProxyConfigService;
 class URLRequestContext;
 class URLRequestJobFactory;
-class URLSecurityManager;
 }
 
 namespace android_webview {
@@ -80,12 +80,11 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter {
   scoped_refptr<net::CookieStore> cookie_store_;
   scoped_ptr<net::URLRequestJobFactory> job_factory_;
   scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings_;
+  // http_auth_preferences_ holds the preferences for the negotiate
+  // authenticator.
+  scoped_ptr<net::HttpAuthPreferences> http_auth_preferences_;

[cbentzel, 2015/12/01 20:56:16]

Is this guaranteed to outlive the negotiate factory that is created.

[aberent, 2015/12/02 13:30:18]

Yes. The factory is owned by the URLRequestContext, which in turn is owned by
the AwURLRequestContextGetter. (member url_request_context_).
http_auth_preferences_ is only updated by CreateNegotiateAuthHandlerFactory,
which, in turn, is only called by InitializeURLRequestContext. Immediately after
the call the url_request_context is updated with the new factory using the new
preferences.

This is less obvious than it should be, but before this CL the same logic
applied to url_security_manager_, so I don't intend to improve this in this CL.

   scoped_ptr<net::URLRequestContext> url_request_context_;
 
-  // URLSecurityManager associated with the negotiate auth handler. It is
-  // configured to follow the auth_server_whitelist_
-  scoped_ptr<net::URLSecurityManager> url_security_manager_;
-
   // Store HTTP Auth-related policies in this thread.
   std::string auth_android_negotiate_account_type_;
   std::string auth_server_whitelist_;