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_; |
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_; |