Chromium Code Reviews| 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 868a67019232113806594958bfdb1739b99407c4..e179b9b2ccd73b5cfebea84034039d1941ee73ce 100644 |
| --- a/android_webview/browser/net/aw_url_request_context_getter.h |
| +++ b/android_webview/browser/net/aw_url_request_context_getter.h |
| @@ -10,18 +10,23 @@ |
| #include "base/files/file_path.h" |
| #include "base/memory/scoped_ptr.h" |
| #include "content/public/browser/content_browser_client.h" |
| +#include "net/http/http_auth_handler_negotiate.h" |
| #include "net/http/http_network_session.h" |
| #include "net/url_request/url_request_context_getter.h" |
| #include "net/url_request/url_request_job_factory.h" |
| +class PrefService; |
| + |
| namespace net { |
| class CookieStore; |
| +class HostResolver; |
| class HttpTransactionFactory; |
| class HttpUserAgentSettings; |
| class NetLog; |
| class ProxyConfigService; |
| class URLRequestContext; |
| class URLRequestJobFactory; |
| +class URLSecurityManager; |
| } |
| namespace android_webview { |
| @@ -30,10 +35,10 @@ class AwNetworkDelegate; |
| class AwURLRequestContextGetter : public net::URLRequestContextGetter { |
| public: |
| - AwURLRequestContextGetter( |
| - const base::FilePath& cache_path, |
| - net::CookieStore* cookie_store, |
| - scoped_ptr<net::ProxyConfigService> config_service); |
| + AwURLRequestContextGetter(const base::FilePath& cache_path, |
| + net::CookieStore* cookie_store, |
| + scoped_ptr<net::ProxyConfigService> config_service, |
| + PrefService* pref_service); |
| // net::URLRequestContextGetter implementation. |
| net::URLRequestContext* GetURLRequestContext() override; |
| @@ -64,6 +69,11 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter { |
| void InitializeURLRequestContext(); |
| + // This is called to create a HttpAuthHandlerFactory that will handle |
| + // negotiate challenges for the new URLRequestContext |
| + scoped_ptr<net::HttpAuthHandlerNegotiate::Factory> |
|
sgurun-gerrit only
2015/11/13 08:43:51
yeah, how will this work, it is only NET_EXPORT_PR
dgn
2015/11/13 12:37:07
Didn't notice that when I wrote the patch, and I g
sgurun-gerrit only
2015/11/18 02:23:28
the other cl already accumulated a lot of lgtm's s
dgn
2015/11/25 00:27:15
What I mentioned above doesn't seem to work anymor
dgn
2015/11/25 19:01:08
Fixed. I'm not creating a factory registry configu
|
| + CreateNegotiateAuthHandlerFactory(net::HostResolver* resolver); |
| + |
| const base::FilePath cache_path_; |
| scoped_ptr<net::NetLog> net_log_; |
| @@ -75,6 +85,14 @@ class AwURLRequestContextGetter : public net::URLRequestContextGetter { |
| scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings_; |
| 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_; |
| + |
| // ProtocolHandlers and interceptors are stored here between |
| // SetHandlersAndInterceptors() and the first GetURLRequestContext() call. |
| content::ProtocolHandlerMap protocol_handlers_; |