OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
498 weak_factory_(this) { | 498 weak_factory_(this) { |
499 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes); | 499 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes); |
500 negotiate_disable_cname_lookup_ = local_state->GetBoolean( | 500 negotiate_disable_cname_lookup_ = local_state->GetBoolean( |
501 prefs::kDisableAuthNegotiateCnameLookup); | 501 prefs::kDisableAuthNegotiateCnameLookup); |
502 negotiate_enable_port_ = local_state->GetBoolean( | 502 negotiate_enable_port_ = local_state->GetBoolean( |
503 prefs::kEnableAuthNegotiatePort); | 503 prefs::kEnableAuthNegotiatePort); |
504 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); | 504 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); |
505 auth_delegate_whitelist_ = local_state->GetString( | 505 auth_delegate_whitelist_ = local_state->GetString( |
506 prefs::kAuthNegotiateDelegateWhitelist); | 506 prefs::kAuthNegotiateDelegateWhitelist); |
507 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); | 507 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); |
| 508 auth_android_negotiate_account_type_ = |
| 509 local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); |
508 pref_proxy_config_tracker_.reset( | 510 pref_proxy_config_tracker_.reset( |
509 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 511 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
510 local_state)); | 512 local_state)); |
511 ChromeNetworkDelegate::InitializePrefsOnUIThread( | 513 ChromeNetworkDelegate::InitializePrefsOnUIThread( |
512 &system_enable_referrers_, | 514 &system_enable_referrers_, |
513 NULL, | 515 NULL, |
514 NULL, | 516 NULL, |
515 NULL, | 517 NULL, |
516 local_state); | 518 local_state); |
517 ssl_config_service_manager_.reset( | 519 ssl_config_service_manager_.reset( |
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1032 // static | 1034 // static |
1033 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { | 1035 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { |
1034 registry->RegisterStringPref(prefs::kAuthSchemes, | 1036 registry->RegisterStringPref(prefs::kAuthSchemes, |
1035 "basic,digest,ntlm,negotiate"); | 1037 "basic,digest,ntlm,negotiate"); |
1036 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); | 1038 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); |
1037 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); | 1039 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); |
1038 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); | 1040 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); |
1039 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, | 1041 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, |
1040 std::string()); | 1042 std::string()); |
1041 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string()); | 1043 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string()); |
| 1044 registry->RegisterStringPref(prefs::kAuthAndroidNegotiateAccountType, |
| 1045 std::string()); |
1042 registry->RegisterStringPref( | 1046 registry->RegisterStringPref( |
1043 data_reduction_proxy::prefs::kDataReductionProxy, std::string()); | 1047 data_reduction_proxy::prefs::kDataReductionProxy, std::string()); |
1044 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); | 1048 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); |
1045 data_reduction_proxy::RegisterPrefs(registry); | 1049 data_reduction_proxy::RegisterPrefs(registry); |
1046 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); | 1050 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); |
1047 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true); | 1051 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true); |
1048 } | 1052 } |
1049 | 1053 |
1050 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( | 1054 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( |
1051 net::HostResolver* resolver) { | 1055 net::HostResolver* resolver) { |
1052 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; | 1056 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; |
1053 if (!auth_server_whitelist_.empty()) { | 1057 if (!auth_server_whitelist_.empty()) { |
1054 auth_filter_default_credentials = | 1058 auth_filter_default_credentials = |
1055 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); | 1059 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); |
1056 } | 1060 } |
1057 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; | 1061 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; |
1058 if (!auth_delegate_whitelist_.empty()) { | 1062 if (!auth_delegate_whitelist_.empty()) { |
1059 auth_filter_delegate = | 1063 auth_filter_delegate = |
1060 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_); | 1064 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_); |
1061 } | 1065 } |
1062 globals_->url_security_manager.reset( | 1066 globals_->url_security_manager.reset( |
1063 net::URLSecurityManager::Create(auth_filter_default_credentials, | 1067 net::URLSecurityManager::Create(auth_filter_default_credentials, |
1064 auth_filter_delegate)); | 1068 auth_filter_delegate)); |
1065 std::vector<std::string> supported_schemes; | 1069 std::vector<std::string> supported_schemes; |
1066 base::SplitString(auth_schemes_, ',', &supported_schemes); | 1070 base::SplitString(auth_schemes_, ',', &supported_schemes); |
1067 | 1071 |
1068 scoped_ptr<net::HttpAuthHandlerRegistryFactory> registry_factory( | 1072 scoped_ptr<net::HttpAuthHandlerRegistryFactory> registry_factory( |
1069 net::HttpAuthHandlerRegistryFactory::Create( | 1073 net::HttpAuthHandlerRegistryFactory::Create( |
1070 supported_schemes, globals_->url_security_manager.get(), | 1074 supported_schemes, globals_->url_security_manager.get(), resolver, |
1071 resolver, gssapi_library_name_, negotiate_disable_cname_lookup_, | 1075 gssapi_library_name_, auth_android_negotiate_account_type_, |
1072 negotiate_enable_port_)); | 1076 negotiate_disable_cname_lookup_, negotiate_enable_port_)); |
1073 return registry_factory.release(); | 1077 return registry_factory.release(); |
1074 } | 1078 } |
1075 | 1079 |
1076 void IOThread::ClearHostCache() { | 1080 void IOThread::ClearHostCache() { |
1077 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1081 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
1078 | 1082 |
1079 net::HostCache* host_cache = globals_->host_resolver->GetHostCache(); | 1083 net::HostCache* host_cache = globals_->host_resolver->GetHostCache(); |
1080 if (host_cache) | 1084 if (host_cache) |
1081 host_cache->clear(); | 1085 host_cache->clear(); |
1082 } | 1086 } |
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1580 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); | 1584 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); |
1581 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1585 for (size_t i = 0; i < supported_versions.size(); ++i) { |
1582 net::QuicVersion version = supported_versions[i]; | 1586 net::QuicVersion version = supported_versions[i]; |
1583 if (net::QuicVersionToString(version) == quic_version) { | 1587 if (net::QuicVersionToString(version) == quic_version) { |
1584 return version; | 1588 return version; |
1585 } | 1589 } |
1586 } | 1590 } |
1587 | 1591 |
1588 return net::QUIC_VERSION_UNSUPPORTED; | 1592 return net::QUIC_VERSION_UNSUPPORTED; |
1589 } | 1593 } |
OLD | NEW |