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 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
493 weak_factory_(this) { | 493 weak_factory_(this) { |
494 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes); | 494 auth_schemes_ = local_state->GetString(prefs::kAuthSchemes); |
495 negotiate_disable_cname_lookup_ = local_state->GetBoolean( | 495 negotiate_disable_cname_lookup_ = local_state->GetBoolean( |
496 prefs::kDisableAuthNegotiateCnameLookup); | 496 prefs::kDisableAuthNegotiateCnameLookup); |
497 negotiate_enable_port_ = local_state->GetBoolean( | 497 negotiate_enable_port_ = local_state->GetBoolean( |
498 prefs::kEnableAuthNegotiatePort); | 498 prefs::kEnableAuthNegotiatePort); |
499 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); | 499 auth_server_whitelist_ = local_state->GetString(prefs::kAuthServerWhitelist); |
500 auth_delegate_whitelist_ = local_state->GetString( | 500 auth_delegate_whitelist_ = local_state->GetString( |
501 prefs::kAuthNegotiateDelegateWhitelist); | 501 prefs::kAuthNegotiateDelegateWhitelist); |
502 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); | 502 gssapi_library_name_ = local_state->GetString(prefs::kGSSAPILibraryName); |
| 503 auth_android_negotiate_account_type_ = |
| 504 local_state->GetString(prefs::kAuthAndroidNegotiateAccountType); |
503 pref_proxy_config_tracker_.reset( | 505 pref_proxy_config_tracker_.reset( |
504 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 506 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
505 local_state)); | 507 local_state)); |
506 ChromeNetworkDelegate::InitializePrefsOnUIThread( | 508 ChromeNetworkDelegate::InitializePrefsOnUIThread( |
507 &system_enable_referrers_, | 509 &system_enable_referrers_, |
508 NULL, | 510 NULL, |
509 NULL, | 511 NULL, |
510 NULL, | 512 NULL, |
511 local_state); | 513 local_state); |
512 ssl_config_service_manager_.reset( | 514 ssl_config_service_manager_.reset( |
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1021 // static | 1023 // static |
1022 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { | 1024 void IOThread::RegisterPrefs(PrefRegistrySimple* registry) { |
1023 registry->RegisterStringPref(prefs::kAuthSchemes, | 1025 registry->RegisterStringPref(prefs::kAuthSchemes, |
1024 "basic,digest,ntlm,negotiate"); | 1026 "basic,digest,ntlm,negotiate"); |
1025 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); | 1027 registry->RegisterBooleanPref(prefs::kDisableAuthNegotiateCnameLookup, false); |
1026 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); | 1028 registry->RegisterBooleanPref(prefs::kEnableAuthNegotiatePort, false); |
1027 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); | 1029 registry->RegisterStringPref(prefs::kAuthServerWhitelist, std::string()); |
1028 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, | 1030 registry->RegisterStringPref(prefs::kAuthNegotiateDelegateWhitelist, |
1029 std::string()); | 1031 std::string()); |
1030 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string()); | 1032 registry->RegisterStringPref(prefs::kGSSAPILibraryName, std::string()); |
| 1033 registry->RegisterStringPref(prefs::kAuthAndroidNegotiateAccountType, |
| 1034 std::string()); |
1031 registry->RegisterStringPref( | 1035 registry->RegisterStringPref( |
1032 data_reduction_proxy::prefs::kDataReductionProxy, std::string()); | 1036 data_reduction_proxy::prefs::kDataReductionProxy, std::string()); |
1033 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); | 1037 registry->RegisterBooleanPref(prefs::kEnableReferrers, true); |
1034 data_reduction_proxy::RegisterPrefs(registry); | 1038 data_reduction_proxy::RegisterPrefs(registry); |
1035 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); | 1039 registry->RegisterBooleanPref(prefs::kBuiltInDnsClientEnabled, true); |
1036 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true); | 1040 registry->RegisterBooleanPref(prefs::kQuickCheckEnabled, true); |
1037 } | 1041 } |
1038 | 1042 |
1039 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( | 1043 net::HttpAuthHandlerFactory* IOThread::CreateDefaultAuthHandlerFactory( |
1040 net::HostResolver* resolver) { | 1044 net::HostResolver* resolver) { |
1041 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; | 1045 net::HttpAuthFilterWhitelist* auth_filter_default_credentials = NULL; |
1042 if (!auth_server_whitelist_.empty()) { | 1046 if (!auth_server_whitelist_.empty()) { |
1043 auth_filter_default_credentials = | 1047 auth_filter_default_credentials = |
1044 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); | 1048 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); |
1045 } | 1049 } |
1046 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; | 1050 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; |
1047 if (!auth_delegate_whitelist_.empty()) { | 1051 if (!auth_delegate_whitelist_.empty()) { |
1048 auth_filter_delegate = | 1052 auth_filter_delegate = |
1049 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_); | 1053 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_); |
1050 } | 1054 } |
1051 globals_->url_security_manager.reset( | 1055 globals_->url_security_manager.reset( |
1052 net::URLSecurityManager::Create(auth_filter_default_credentials, | 1056 net::URLSecurityManager::Create(auth_filter_default_credentials, |
1053 auth_filter_delegate)); | 1057 auth_filter_delegate)); |
1054 std::vector<std::string> supported_schemes; | 1058 std::vector<std::string> supported_schemes; |
1055 base::SplitString(auth_schemes_, ',', &supported_schemes); | 1059 base::SplitString(auth_schemes_, ',', &supported_schemes); |
1056 | 1060 |
1057 scoped_ptr<net::HttpAuthHandlerRegistryFactory> registry_factory( | 1061 scoped_ptr<net::HttpAuthHandlerRegistryFactory> registry_factory( |
1058 net::HttpAuthHandlerRegistryFactory::Create( | 1062 net::HttpAuthHandlerRegistryFactory::Create( |
1059 supported_schemes, globals_->url_security_manager.get(), | 1063 supported_schemes, globals_->url_security_manager.get(), resolver, |
1060 resolver, gssapi_library_name_, negotiate_disable_cname_lookup_, | 1064 gssapi_library_name_, auth_android_negotiate_account_type_, |
1061 negotiate_enable_port_)); | 1065 negotiate_disable_cname_lookup_, negotiate_enable_port_)); |
1062 return registry_factory.release(); | 1066 return registry_factory.release(); |
1063 } | 1067 } |
1064 | 1068 |
1065 void IOThread::ClearHostCache() { | 1069 void IOThread::ClearHostCache() { |
1066 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1070 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
1067 | 1071 |
1068 net::HostCache* host_cache = globals_->host_resolver->GetHostCache(); | 1072 net::HostCache* host_cache = globals_->host_resolver->GetHostCache(); |
1069 if (host_cache) | 1073 if (host_cache) |
1070 host_cache->clear(); | 1074 host_cache->clear(); |
1071 } | 1075 } |
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1569 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); | 1573 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); |
1570 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1574 for (size_t i = 0; i < supported_versions.size(); ++i) { |
1571 net::QuicVersion version = supported_versions[i]; | 1575 net::QuicVersion version = supported_versions[i]; |
1572 if (net::QuicVersionToString(version) == quic_version) { | 1576 if (net::QuicVersionToString(version) == quic_version) { |
1573 return version; | 1577 return version; |
1574 } | 1578 } |
1575 } | 1579 } |
1576 | 1580 |
1577 return net::QUIC_VERSION_UNSUPPORTED; | 1581 return net::QUIC_VERSION_UNSUPPORTED; |
1578 } | 1582 } |
OLD | NEW |