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 1054 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1065 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); | 1065 new net::HttpAuthFilterWhitelist(auth_server_whitelist_); |
1066 } | 1066 } |
1067 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; | 1067 net::HttpAuthFilterWhitelist* auth_filter_delegate = NULL; |
1068 if (!auth_delegate_whitelist_.empty()) { | 1068 if (!auth_delegate_whitelist_.empty()) { |
1069 auth_filter_delegate = | 1069 auth_filter_delegate = |
1070 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_); | 1070 new net::HttpAuthFilterWhitelist(auth_delegate_whitelist_); |
1071 } | 1071 } |
1072 globals_->url_security_manager.reset( | 1072 globals_->url_security_manager.reset( |
1073 net::URLSecurityManager::Create(auth_filter_default_credentials, | 1073 net::URLSecurityManager::Create(auth_filter_default_credentials, |
1074 auth_filter_delegate)); | 1074 auth_filter_delegate)); |
1075 std::vector<std::string> supported_schemes; | 1075 std::vector<std::string> supported_schemes = base::SplitString( |
1076 base::SplitString(auth_schemes_, ',', &supported_schemes); | 1076 auth_schemes_, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
1077 | 1077 |
1078 scoped_ptr<net::HttpAuthHandlerRegistryFactory> registry_factory( | 1078 scoped_ptr<net::HttpAuthHandlerRegistryFactory> registry_factory( |
1079 net::HttpAuthHandlerRegistryFactory::Create( | 1079 net::HttpAuthHandlerRegistryFactory::Create( |
1080 supported_schemes, globals_->url_security_manager.get(), resolver, | 1080 supported_schemes, globals_->url_security_manager.get(), resolver, |
1081 gssapi_library_name_, auth_android_negotiate_account_type_, | 1081 gssapi_library_name_, auth_android_negotiate_account_type_, |
1082 negotiate_disable_cname_lookup_, negotiate_enable_port_)); | 1082 negotiate_disable_cname_lookup_, negotiate_enable_port_)); |
1083 return registry_factory.release(); | 1083 return registry_factory.release(); |
1084 } | 1084 } |
1085 | 1085 |
1086 void IOThread::ClearHostCache() { | 1086 void IOThread::ClearHostCache() { |
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1593 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); | 1593 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); |
1594 for (size_t i = 0; i < supported_versions.size(); ++i) { | 1594 for (size_t i = 0; i < supported_versions.size(); ++i) { |
1595 net::QuicVersion version = supported_versions[i]; | 1595 net::QuicVersion version = supported_versions[i]; |
1596 if (net::QuicVersionToString(version) == quic_version) { | 1596 if (net::QuicVersionToString(version) == quic_version) { |
1597 return version; | 1597 return version; |
1598 } | 1598 } |
1599 } | 1599 } |
1600 | 1600 |
1601 return net::QUIC_VERSION_UNSUPPORTED; | 1601 return net::QUIC_VERSION_UNSUPPORTED; |
1602 } | 1602 } |
OLD | NEW |