| Index: net/proxy/proxy_config.cc
|
| diff --git a/net/proxy/proxy_config.cc b/net/proxy/proxy_config.cc
|
| index 86c5284d837429b03e201b76b948c172f6ec1c40..51f03ddd7b28454d0e052187e4f8fe884fc90573 100644
|
| --- a/net/proxy/proxy_config.cc
|
| +++ b/net/proxy/proxy_config.cc
|
| @@ -36,8 +36,7 @@ void AddProxyURIListToProxyList(std::string uri_list,
|
| } // namespace
|
|
|
| ProxyConfig::ProxyRules::ProxyRules()
|
| - : reverse_bypass(false),
|
| - type(TYPE_NO_RULES) {
|
| + : reverse_bypass(false), type(TYPE_NO_RULES) {
|
| }
|
|
|
| ProxyConfig::ProxyRules::~ProxyRules() {
|
| @@ -104,9 +103,8 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
|
| if (!proxy_server_for_scheme.GetNext()) {
|
| if (type == TYPE_PROXY_PER_SCHEME)
|
| continue; // Unexpected.
|
| - AddProxyURIListToProxyList(url_scheme,
|
| - &single_proxies,
|
| - ProxyServer::SCHEME_HTTP);
|
| + AddProxyURIListToProxyList(
|
| + url_scheme, &single_proxies, ProxyServer::SCHEME_HTTP);
|
| type = TYPE_SINGLE_PROXY;
|
| return;
|
| }
|
| @@ -131,9 +129,8 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
|
| }
|
|
|
| if (entry) {
|
| - AddProxyURIListToProxyList(proxy_server_for_scheme.token(),
|
| - entry,
|
| - default_scheme);
|
| + AddProxyURIListToProxyList(
|
| + proxy_server_for_scheme.token(), entry, default_scheme);
|
| }
|
| }
|
| }
|
| @@ -141,8 +138,9 @@ void ProxyConfig::ProxyRules::ParseFromString(const std::string& proxy_rules) {
|
|
|
| const ProxyList* ProxyConfig::ProxyRules::MapUrlSchemeToProxyList(
|
| const std::string& url_scheme) const {
|
| - const ProxyList* proxy_server_list = const_cast<ProxyRules*>(this)->
|
| - MapUrlSchemeToProxyListNoFallback(url_scheme);
|
| + const ProxyList* proxy_server_list =
|
| + const_cast<ProxyRules*>(this)
|
| + ->MapUrlSchemeToProxyListNoFallback(url_scheme);
|
| if (proxy_server_list && !proxy_server_list->IsEmpty())
|
| return proxy_server_list;
|
| if (!fallback_proxies.IsEmpty())
|
| @@ -151,8 +149,7 @@ const ProxyList* ProxyConfig::ProxyRules::MapUrlSchemeToProxyList(
|
| }
|
|
|
| bool ProxyConfig::ProxyRules::Equals(const ProxyRules& other) const {
|
| - return type == other.type &&
|
| - single_proxies.Equals(other.single_proxies) &&
|
| + return type == other.type && single_proxies.Equals(other.single_proxies) &&
|
| proxies_for_http.Equals(other.proxies_for_http) &&
|
| proxies_for_https.Equals(other.proxies_for_https) &&
|
| proxies_for_ftp.Equals(other.proxies_for_ftp) &&
|
| @@ -174,8 +171,10 @@ ProxyList* ProxyConfig::ProxyRules::MapUrlSchemeToProxyListNoFallback(
|
| }
|
|
|
| ProxyConfig::ProxyConfig()
|
| - : auto_detect_(false), pac_mandatory_(false),
|
| - source_(PROXY_CONFIG_SOURCE_UNKNOWN), id_(kInvalidConfigID) {
|
| + : auto_detect_(false),
|
| + pac_mandatory_(false),
|
| + source_(PROXY_CONFIG_SOURCE_UNKNOWN),
|
| + id_(kInvalidConfigID) {
|
| }
|
|
|
| ProxyConfig::ProxyConfig(const ProxyConfig& config)
|
| @@ -203,8 +202,7 @@ ProxyConfig& ProxyConfig::operator=(const ProxyConfig& config) {
|
| bool ProxyConfig::Equals(const ProxyConfig& other) const {
|
| // The two configs can have different IDs and sources. We are just interested
|
| // in if they have the same settings.
|
| - return auto_detect_ == other.auto_detect_ &&
|
| - pac_url_ == other.pac_url_ &&
|
| + return auto_detect_ == other.auto_detect_ && pac_url_ == other.pac_url_ &&
|
| pac_mandatory_ == other.pac_mandatory_ &&
|
| proxy_rules_.Equals(other.proxy_rules());
|
| }
|
| @@ -234,8 +232,7 @@ base::DictionaryValue* ProxyConfig::ToValue() const {
|
| if (proxy_rules_.type != ProxyRules::TYPE_NO_RULES) {
|
| switch (proxy_rules_.type) {
|
| case ProxyRules::TYPE_SINGLE_PROXY:
|
| - AddProxyListToValue("single_proxy",
|
| - proxy_rules_.single_proxies, dict);
|
| + AddProxyListToValue("single_proxy", proxy_rules_.single_proxies, dict);
|
| break;
|
| case ProxyRules::TYPE_PROXY_PER_SCHEME: {
|
| base::DictionaryValue* dict2 = new base::DictionaryValue();
|
| @@ -259,8 +256,9 @@ base::DictionaryValue* ProxyConfig::ToValue() const {
|
| base::ListValue* list = new base::ListValue();
|
|
|
| for (ProxyBypassRules::RuleList::const_iterator it =
|
| - bypass.rules().begin();
|
| - it != bypass.rules().end(); ++it) {
|
| + bypass.rules().begin();
|
| + it != bypass.rules().end();
|
| + ++it) {
|
| list->Append(new base::StringValue((*it)->ToString()));
|
| }
|
|
|
|
|