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 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
513 weak_factory_(this) { | 513 weak_factory_(this) { |
514 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes); | 514 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes); |
515 negotiate_disable_cname_lookup_ = local_state->GetBoolean( | 515 negotiate_disable_cname_lookup_ = local_state->GetBoolean( |
516 prefs::kDisableAuthNegotiateCnameLookup); | 516 prefs::kDisableAuthNegotiateCnameLookup); |
517 negotiate_enable_port_ = local_state->GetBoolean( | 517 negotiate_enable_port_ = local_state->GetBoolean( |
518 prefs::kEnableAuthNegotiatePort); | 518 prefs::kEnableAuthNegotiatePort); |
519 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); | 519 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); |
520 auth_delegate_whitelist_ = local_state->GetString( | 520 auth_delegate_whitelist_ = local_state->GetString( |
521 prefs::kAuthNegotiateDelegateWhitelist); | 521 prefs::kAuthNegotiateDelegateWhitelist); |
522 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); | 522 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); |
| 523 auth_android_negotiate_account_type_ = |
| 524 local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); |
523 pref_proxy_config_tracker_.reset( | 525 pref_proxy_config_tracker_.reset( |
524 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 526 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
525 local_state)); | 527 local_state)); |
526 ChromeNetworkDelegate::InitializePrefsOnUIThread( | 528 ChromeNetworkDelegate::InitializePrefsOnUIThread( |
527 &system_enable_referrers_, | 529 &system_enable_referrers_, |
528 NULL, | 530 NULL, |
529 NULL, | 531 NULL, |
530 NULL, | 532 NULL, |
531 local_state); | 533 local_state); |
532 ssl_config_service_manager_.reset( | 534 ssl_config_service_manager_.reset( |
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1077 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { | 1079 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { |
1078 registry->RegisterStringPref(prefs::kAuthSchemes, | 1080 registry->RegisterStringPref(prefs::kAuthSchemes, |
1079 "basic,digest,ntlm,negotiate," | 1081 "basic,digest,ntlm,negotiate," |
1080 "spdyproxy"); | 1082 "spdyproxy"); |
1081 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); | 1083 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); |
1082 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); | 1084 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); |
1083 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); | 1085 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); |
1084 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, | 1086 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, |
1085 std::string()); | 1087 std::string()); |
1086 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string()); | 1088 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string()); |
| 1089 registry->RegisterStringPref(prefs::kAuthAndroidNegotiateAccountType, |
| 1090 std::string()); |
1087 registry->RegisterStringPref( | 1091 registry->RegisterStringPref( |
1088 data_reduction_proxy::prefs::kDataReductionProxy, std::string()); | 1092 data_reduction_proxy::prefs::kDataReductionProxy, std::string()); |
1089 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); | 1093 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); |
1090 data_reduction_proxy::RegisterPrefs(registry); | 1094 data_reduction_proxy::RegisterPrefs(registry); |
1091 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); | 1095 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); |
1092 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true); | 1096 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true); |
1093 } | 1097 } |
1094 | 1098 |
1095 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( | 1099 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( |
1096 net::HostResolver* resolver) { | 1100 net::HostResolver* resolver) { |
1097 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; | 1101 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; |
1098 if (!auth_server_whitelist_.empty()) { | 1102 if (!auth_server_whitelist_.empty()) { |
1099 auth_filter_default_credentials = | 1103 auth_filter_default_credentials = |
1100 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); | 1104 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); |
1101 } | 1105 } |
1102 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; | 1106 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; |
1103 if (!auth_delegate_whitelist_.empty()) { | 1107 if (!auth_delegate_whitelist_.empty()) { |
1104 auth_filter_delegate = | 1108 auth_filter_delegate = |
1105 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_); | 1109 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_); |
1106 } | 1110 } |
1107 globals_->url_security_manager.reset( | 1111 globals_->url_security_manager.reset( |
1108 net::URLSecurityManager::Create(auth_filter_default_credentials, | 1112 net::URLSecurityManager::Create(auth_filter_default_credentials, |
1109 auth_filter_delegate)); | 1113 auth_filter_delegate)); |
1110 std::vector<std::string> supported_schemes; | 1114 std::vector<std::string> supported_schemes; |
1111 base::SplitString(auth_schemes_, ',', &supported_schemes); | 1115 base::SplitString(auth_schemes_, ',', &supported_schemes); |
1112 | 1116 |
1113 scoped_ptr<net::HttpAuthHandlerRegistryFactory> registry_factory( | 1117 scoped_ptr<net::HttpAuthHandlerRegistryFactory> registry_factory( |
1114 net::HttpAuthHandlerRegistryFactory::Create( | 1118 net::HttpAuthHandlerRegistryFactory::Create( |
1115 supported_schemes, globals_->url_security_manager.get(), | 1119 supported_schemes, globals_->url_security_manager.get(), resolver, |
1116 resolver, gssapi_library_name_, negotiate_disable_cname_lookup_, | 1120 gssapi_library_name_, auth_android_negotiate_account_type_, |
1117 negotiate_enable_port_)); | 1121 negotiate_disable_cname_lookup_, negotiate_enable_port_)); |
1118 return registry_factory.release(); | 1122 return registry_factory.release(); |
1119 } | 1123 } |
1120 | 1124 |
1121 void IOThread::ClearHostCache() { | 1125 void IOThread::ClearHostCache() { |
1122 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1126 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
1123 | 1127 |
1124 net::HostCache* host_cache = globals_->host_resolver->GetHostCache(); | 1128 net::HostCache* host_cache = globals_->host_resolver->GetHostCache(); |
1125 if (host_cache) | 1129 if (host_cache) |
1126 host_cache->clear(); | 1130 host_cache->clear(); |
1127 } | 1131 } |
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1632 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); | 1636 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); |
1633 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1637 for (size_t i = 0; i < supported_versions.size(); ++i) { |
1634 net::QuicVersion version = supported_versions[i]; | 1638 net::QuicVersion version = supported_versions[i]; |
1635 if (net::QuicVersionToString(version) == quic_version) { | 1639 if (net::QuicVersionToString(version) == quic_version) { |
1636 return version; | 1640 return version; |
1637 } | 1641 } |
1638 } | 1642 } |
1639 | 1643 |
1640 return net::QUIC_VERSION_UNSUPPORTED; | 1644 return net::QUIC_VERSION_UNSUPPORTED; |
1641 } | 1645 } |
OLD | NEW |