| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "net/proxy/proxy_config_service_common_unittest.h" | 5 #include "net/proxy/proxy_config_service_common_unittest.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "net/proxy/proxy_config.h" | 10 #include "net/proxy/proxy_config.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 << type << " but was: " << rules.type; | 59 << type << " but was: " << rules.type; |
| 60 failed = true; | 60 failed = true; |
| 61 } | 61 } |
| 62 | 62 |
| 63 MatchesProxyServerHelper("Bad single_proxy", single_proxy, | 63 MatchesProxyServerHelper("Bad single_proxy", single_proxy, |
| 64 rules.single_proxy, &failure_details, &failed); | 64 rules.single_proxy, &failure_details, &failed); |
| 65 MatchesProxyServerHelper("Bad proxy_for_http", proxy_for_http, | 65 MatchesProxyServerHelper("Bad proxy_for_http", proxy_for_http, |
| 66 rules.proxy_for_http, &failure_details, &failed); | 66 rules.proxy_for_http, &failure_details, &failed); |
| 67 MatchesProxyServerHelper("Bad proxy_for_https", proxy_for_https, | 67 MatchesProxyServerHelper("Bad proxy_for_https", proxy_for_https, |
| 68 rules.proxy_for_https, &failure_details, &failed); | 68 rules.proxy_for_https, &failure_details, &failed); |
| 69 MatchesProxyServerHelper("Bad proxy_for_socks", socks_proxy, | 69 MatchesProxyServerHelper("Bad fallback_proxy", fallback_proxy, |
| 70 rules.socks_proxy, &failure_details, &failed); | 70 rules.fallback_proxy, &failure_details, &failed); |
| 71 | 71 |
| 72 std::string actual_flattened_bypass = FlattenProxyBypass(rules.bypass_rules); | 72 std::string actual_flattened_bypass = FlattenProxyBypass(rules.bypass_rules); |
| 73 if (std::string(flattened_bypass_rules) != actual_flattened_bypass) { | 73 if (std::string(flattened_bypass_rules) != actual_flattened_bypass) { |
| 74 failure_details | 74 failure_details |
| 75 << "Bad bypass rules. Expected: \"" << flattened_bypass_rules | 75 << "Bad bypass rules. Expected: \"" << flattened_bypass_rules |
| 76 << "\" but got: \"" << actual_flattened_bypass << "\""; | 76 << "\" but got: \"" << actual_flattened_bypass << "\""; |
| 77 failed = true; | 77 failed = true; |
| 78 } | 78 } |
| 79 | 79 |
| 80 if (rules.reverse_bypass != reverse_bypass) { | 80 if (rules.reverse_bypass != reverse_bypass) { |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 const char* proxy_http, | 137 const char* proxy_http, |
| 138 const char* proxy_https, | 138 const char* proxy_https, |
| 139 const char* proxy_ftp, | 139 const char* proxy_ftp, |
| 140 const char* flattened_bypass_rules) { | 140 const char* flattened_bypass_rules) { |
| 141 return ProxyRulesExpectation(ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME, | 141 return ProxyRulesExpectation(ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME, |
| 142 "", proxy_http, proxy_https, proxy_ftp, "", | 142 "", proxy_http, proxy_https, proxy_ftp, "", |
| 143 flattened_bypass_rules, true); | 143 flattened_bypass_rules, true); |
| 144 } | 144 } |
| 145 | 145 |
| 146 } // namespace net | 146 } // namespace net |
| OLD | NEW |