| Index: net/proxy/proxy_config.cc
|
| diff --git a/net/proxy/proxy_config.cc b/net/proxy/proxy_config.cc
|
| index ce14358e23b2e6d872d0c7defb7769f11d143433..70e6549a794def718c815d5581eb917c8bc69250 100644
|
| --- a/net/proxy/proxy_config.cc
|
| +++ b/net/proxy/proxy_config.cc
|
| @@ -32,17 +32,6 @@ ProxyConfig::ProxyRules::ProxyRules()
|
| ProxyConfig::ProxyRules::~ProxyRules() {
|
| }
|
|
|
| -bool ProxyConfig::ProxyRules::Equals(const ProxyRules& other) const {
|
| - return type == other.type &&
|
| - single_proxy == other.single_proxy &&
|
| - proxy_for_http == other.proxy_for_http &&
|
| - proxy_for_https == other.proxy_for_https &&
|
| - proxy_for_ftp == other.proxy_for_ftp &&
|
| - fallback_proxy == other.fallback_proxy &&
|
| - bypass_rules.Equals(other.bypass_rules) &&
|
| - reverse_bypass == other.reverse_bypass;
|
| -}
|
| -
|
| void ProxyConfig::ProxyRules::Apply(const GURL& url, ProxyInfo* result) {
|
| if (empty()) {
|
| result->UseDirect();
|
| @@ -146,6 +135,17 @@ const ProxyServer* ProxyConfig::ProxyRules::MapUrlSchemeToProxy(
|
| return NULL; // No mapping for this scheme. Use direct.
|
| }
|
|
|
| +bool ProxyConfig::ProxyRules::Equals(const ProxyRules& other) const {
|
| + return type == other.type &&
|
| + single_proxy == other.single_proxy &&
|
| + proxy_for_http == other.proxy_for_http &&
|
| + proxy_for_https == other.proxy_for_https &&
|
| + proxy_for_ftp == other.proxy_for_ftp &&
|
| + fallback_proxy == other.fallback_proxy &&
|
| + bypass_rules.Equals(other.bypass_rules) &&
|
| + reverse_bypass == other.reverse_bypass;
|
| +}
|
| +
|
| ProxyServer* ProxyConfig::ProxyRules::MapUrlSchemeToProxyNoFallback(
|
| const std::string& scheme) {
|
| DCHECK_EQ(TYPE_PROXY_PER_SCHEME, type);
|
|
|