Cleanup: rename ProxyRules::socks_proxy --> ProxyRules::fallback_proxy....

chrome/browser/chromeos/proxy_config_service_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
 
 #include <ostream>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 111 matching lines @@
       net_config->proxy_rules().single_proxy = single_proxy.server;
       net_config->proxy_rules().bypass_rules = bypass_rules;
       break;
     case MODE_PROXY_PER_SCHEME:
       *net_config = net::ProxyConfig();
       net_config->proxy_rules().type =
           net::ProxyConfig::ProxyRules::TYPE_PROXY_PER_SCHEME;
       net_config->proxy_rules().proxy_for_http = http_proxy.server;
       net_config->proxy_rules().proxy_for_https = https_proxy.server;
       net_config->proxy_rules().proxy_for_ftp = ftp_proxy.server;
-      net_config->proxy_rules().socks_proxy = socks_proxy.server;
+      net_config->proxy_rules().fallback_proxy = socks_proxy.server;
       net_config->proxy_rules().bypass_rules = bypass_rules;
       break;
     default:
       NOTREACHED() << "Unrecognized proxy config mode";
       break;
   }
 }
 
 std::string ProxyConfigServiceImpl::ProxyConfig::ToString() const {
   return ProxyConfigToString(*this);
@@ skipping 153 matching lines @@
   LOG(INFO) << "Proxy configuration changed";
   cached_config_ = new_config;
   // Notify observers of new proxy config.
   net::ProxyConfig net_config;
   cached_config_.ConvertToNetProxyConfig(&net_config);
   FOR_EACH_OBSERVER(net::ProxyConfigService::Observer, observers_,
                     OnProxyConfigChanged(net_config));
 }
 
 }  // namespace chromeos