Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1409)

Unified Diff: chrome/browser/io_thread.h

Issue 1414313002: Allow dynamic updating of authentication policies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handle conflicting Android Webview change Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 19e08f19054026fb7e696b5fd2df00e74affa1aa..b8a00e51c21ce3c13aeedcfd69b0b94b549eb286 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -64,7 +64,7 @@ class CTLogVerifier;
class FtpTransactionFactory;
class HostMappingRules;
class HostResolver;
-class HttpAuthHandlerFactory;
+class HttpAuthHandlerRegistryFactory;
class HttpNetworkSession;
class HttpServerProperties;
class HttpTransactionFactory;
@@ -79,7 +79,7 @@ class URLRequestBackoffManager;
class URLRequestContext;
class URLRequestContextGetter;
class URLRequestJobFactory;
-class URLSecurityManager;
+class HttpAuthPreferences;
asanka 2015/12/01 05:30:03 Sort.
aberent 2015/12/01 14:33:25 Done.
} // namespace net
namespace net_log {
@@ -169,7 +169,7 @@ 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;
+ scoped_ptr<net::HttpAuthPreferences> http_auth_preferences;
// TODO(willchan): Remove proxy script fetcher context since it's not
// necessary now that I got rid of refcounting URLRequestContexts.
//
@@ -324,8 +324,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();
@@ -333,6 +332,11 @@ class IOThread : public content::BrowserThreadDelegate {
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.
@@ -509,13 +513,23 @@ 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 (https://crbug/549273).
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_;
+
+#if defined(OS_ANDROID)
+ StringPrefMember auth_android_negotiate_account_type_;
+#endif
+#if defined(OS_POSIX) && !defined(OS_ANDROID)
+ // 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_;
+#endif
// This is an instance of the default SSLConfigServiceManager for the current
// platform and it gets SSL preferences from local_state object.

Powered by Google App Engine
This is Rietveld 408576698