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

net/proxy/proxy_config.h

 // 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.
 
 #ifndef NET_PROXY_PROXY_CONFIG_H_
 #define NET_PROXY_PROXY_CONFIG_H_
 #pragma once
 
 #include <string>
 
@@ skipping 52 matching lines @@
     // For example:
     //   "http=foopy:80;ftp=foopy2"  -- use HTTP proxy "foopy:80" for http://
     //                                  URLs, and HTTP proxy "foopy2:80" for
     //                                  ftp:// URLs.
     //   "foopy:80"                  -- use HTTP proxy "foopy:80" for all URLs.
     //   "socks4://foopy"            -- use SOCKS v4 proxy "foopy:1080" for all
     //                                  URLs.
     void ParseFromString(const std::string& proxy_rules);
 
     // Returns one of {&proxy_for_http, &proxy_for_https, &proxy_for_ftp,
-    // &socks_proxy}, or NULL if it is a scheme that we don't have a mapping
-    // for. If the scheme mapping is not present and socks_proxy is defined,
-    // we fall back to using socks_proxy.
+    // &fallback_proxy}, or NULL if there is no proxy to use.
     // Should only call this if the type is TYPE_PROXY_PER_SCHEME.
     const ProxyServer* MapUrlSchemeToProxy(const std::string& url_scheme) const;
 
     // Returns true if |*this| describes the same configuration as |other|.
     bool Equals(const ProxyRules& other) const;
 
     // Exceptions for when not to use a proxy.
     ProxyBypassRules bypass_rules;
 
     // Reverse the meaning of |bypass_rules|.
     bool reverse_bypass;
 
     Type type;
 
     // Set if |type| is TYPE_SINGLE_PROXY.
     ProxyServer single_proxy;
 
     // Set if |type| is TYPE_PROXY_PER_SCHEME.
     ProxyServer proxy_for_http;
     ProxyServer proxy_for_https;
     ProxyServer proxy_for_ftp;
 
-    // Set if the configuration has a SOCKS proxy fallback.
-    ProxyServer socks_proxy;
+    // Used when there isn't a more specific per-scheme proxy server.
+    ProxyServer fallback_proxy;
 
    private:
-    // Returns one of {&proxy_for_http, &proxy_for_https, &proxy_for_ftp,
-    // &socks_proxy}, or NULL if it is a scheme that we don't have a mapping
+    // Returns one of {&proxy_for_http, &proxy_for_https, &proxy_for_ftp}
+    // or NULL if it is a scheme that we don't have a mapping
     // for. Should only call this if the type is TYPE_PROXY_PER_SCHEME.
-    ProxyServer* MapSchemeToProxy(const std::string& scheme);
+    ProxyServer* MapUrlSchemeToProxyNoFallback(const std::string& scheme);
   };
 
   typedef int ID;
 
   // Indicates an invalid proxy config.
   enum { INVALID_ID = 0 };
 
   ProxyConfig();
 
   // Used to numerically identify this configuration.
@@ skipping 72 matching lines @@
   ProxyRules proxy_rules_;
 
   int id_;
 };
 
 }  // namespace net
 
 
 
 #endif  // NET_PROXY_PROXY_CONFIG_H_