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

net/proxy/proxy_config_unittest.cc

 // Copyright (c) 2009 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 "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service_common_unittest.h"
 #include "net/proxy/proxy_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ skipping 86 matching lines @@
 
 TEST(ProxyConfigTest, ParseProxyRules) {
   const struct {
     const char* proxy_rules;
 
     ProxyConfig::ProxyRules::Type type;
     const char* single_proxy;
     const char* proxy_for_http;
     const char* proxy_for_https;
     const char* proxy_for_ftp;
-    const char* socks_proxy;
+    const char* fallback_proxy;
   } tests[] = {
     // One HTTP proxy for all schemes.
     {
       "myproxy:80",
 
       ProxyConfig::ProxyRules::TYPE_SINGLE_PROXY,
       "myproxy:80",
       NULL,
       NULL,
       NULL,
@@ skipping 121 matching lines @@
 
     EXPECT_EQ(tests[i].type, config.proxy_rules().type);
     ExpectProxyServerEquals(tests[i].single_proxy,
                             config.proxy_rules().single_proxy);
     ExpectProxyServerEquals(tests[i].proxy_for_http,
                             config.proxy_rules().proxy_for_http);
     ExpectProxyServerEquals(tests[i].proxy_for_https,
                             config.proxy_rules().proxy_for_https);
     ExpectProxyServerEquals(tests[i].proxy_for_ftp,
                             config.proxy_rules().proxy_for_ftp);
-    ExpectProxyServerEquals(tests[i].socks_proxy,
-                            config.proxy_rules().socks_proxy);
+    ExpectProxyServerEquals(tests[i].fallback_proxy,
+                            config.proxy_rules().fallback_proxy);
   }
 }
 
 TEST(ProxyConfigTest, ToString) {
   // Manual proxy.
   {
     ProxyConfig config;
     config.set_auto_detect(false);
     config.proxy_rules().ParseFromString("http://single-proxy:81");
 
@@ skipping 67 matching lines @@
     config.set_auto_detect(false);
     config.proxy_rules().ParseFromString(
         "http=http://proxy-for-http:1801; socks=socks-server:6083");
 
     EXPECT_EQ("Automatic settings:\n"
               "  Auto-detect: No\n"
               "  Custom PAC script: [None]\n"
               "Manual settings:\n"
               "  Proxy server: \n"
               "    HTTP: proxy-for-http:1801\n"
-              "    SOCKS: socks4://socks-server:6083\n"
+              "    (fallback): socks4://socks-server:6083\n"
               "  Bypass list: [None]",
               config.ToString());
   }
 
   // No proxy.
   {
     ProxyConfig config;
     config.set_auto_detect(false);
 
     EXPECT_EQ("Automatic settings:\n"
@@ skipping 72 matching lines @@
     EXPECT_TRUE(info[1].is_direct());
 
     config.proxy_rules().Apply(url2, &info[2]);
     EXPECT_EQ("single-proxy:81", info[2].proxy_server().ToURI());
   }
 }
 
 }  // namespace
 }  // namespace net