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

chrome/browser/importer/firefox_proxy_settings.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/importer/firefox_proxy_settings.h"
 
 #include "base/file_path.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/values.h"
@@ skipping 129 matching lines @@
   if (!ssl_proxy().empty()) {
     config->proxy_rules().proxy_for_https = net::ProxyServer(
         net::ProxyServer::SCHEME_HTTP,
         net::HostPortPair(ssl_proxy(), ssl_proxy_port()));
   }
 
   if (!socks_host().empty()) {
     net::ProxyServer::Scheme proxy_scheme = V5 == socks_version() ?
         net::ProxyServer::SCHEME_SOCKS5 : net::ProxyServer::SCHEME_SOCKS4;
 
-    config->proxy_rules().socks_proxy = net::ProxyServer(
+    config->proxy_rules().fallback_proxy = net::ProxyServer(
         proxy_scheme,
         net::HostPortPair(socks_host(), socks_port()));
   }
 
   config->proxy_rules().bypass_rules.ParseFromStringUsingSuffixMatching(
       JoinString(proxy_bypass_list_, ';'));
 
   return true;
 }
 
@@ skipping 53 matching lines @@
       while (string_tok.GetNext()) {
         std::string token = string_tok.token();
         TrimWhitespaceASCII(token, TRIM_ALL, &token);
         if (!token.empty())
           settings->proxy_bypass_list_.push_back(token);
       }
     }
   }
   return true;
 }