Correct manual proxy selection for WebSockets.

net/proxy/proxy_config.h

Index: net/proxy/proxy_config.h
diff --git a/net/proxy/proxy_config.h b/net/proxy/proxy_config.h
index e558174a4658bc558afaa331035b766548274e92..298f10b92d7d17f4add43247f4d1a02a77b91739 100644
--- a/net/proxy/proxy_config.h
+++ b/net/proxy/proxy_config.h
@@ -137,10 +137,14 @@ class NET_EXPORT ProxyConfig {
     ProxyList fallback_proxies;
 
    private:
-    // Returns one of {&proxies_for_http, &proxies_for_https, &proxies_for_ftp}
-    // or NULL if it is a scheme that we don't have a mapping
+    // Returns one of {&proxies_for_http, &proxies_for_https, &proxies_for_ftp,
+    // &fallback_proxies} 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.
     ProxyList* MapUrlSchemeToProxyListNoFallback(const std::string& scheme);

[tyoshino (SeeGerritForStatus), 2014/10/27 15:28:29]

there's no fallback in this method, but we're going to have it return
fallback_proxies for ws/wss scheme. a little confusing.

for example, ...

- inline MapUrlSchemeToProxyListNoFallback() into MapUrlSchemeToProxyList() and
rename it to "MapUrlSchemeToProxyListForParsing()"

- inline MapUrlSchemeToProxyListNoFallback() and
GetProxyListForWebSocketScheme() into one function named
"MapUrlSchemeToProxyListForApplying()"

[Adam Rice, 2014/10/28 02:22:23]

MapUrlSchemeToProxyList() is not called during parsing, so I moved the call to
GetProxyListForWebSocketScheme() to there. PTAL.

+
+    // Returns the first of {&fallback_proxies, &proxies_for_https,
+    // &proxies_for_http} that is non-empty, or NULL.
+    ProxyList* GetProxyListForWebSocketScheme();
   };
 
   typedef int ID;