Merge to M39: Correct manual proxy selection for WebSockets.

net/proxy/proxy_config.h

 // Copyright (c) 2012 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_
 
 #include <string>
 
 #include "net/base/net_export.h"
@@ skipping 120 matching lines @@
     ProxyList proxies_for_http;
     ProxyList proxies_for_https;
     ProxyList proxies_for_ftp;
 
     // Used when a fallback has been defined and the url to be proxied doesn't
     // match any of the standard schemes.
     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
-    // for. Should only call this if the type is TYPE_PROXY_PER_SCHEME.
+    // 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. Intentionally returns
+    // NULL for "ws" and "wss" as those are handled specially by
+    // GetProxyListForWebSocketScheme().
     ProxyList* MapUrlSchemeToProxyListNoFallback(const std::string& scheme);
+
+    // Returns the first of {&fallback_proxies, &proxies_for_https,
+    // &proxies_for_http} that is non-empty, or NULL.
+    const ProxyList* GetProxyListForWebSocketScheme() const;
   };
 
   typedef int ID;
 
   // Indicates an invalid proxy config.
   static const ID kInvalidConfigID = 0;
 
   ProxyConfig();
   ProxyConfig(const ProxyConfig& config);
   ~ProxyConfig();
@@ skipping 100 matching lines @@
   ProxyConfigSource source_;
 
   ID id_;
 };
 
 }  // namespace net
 
 
 
 #endif  // NET_PROXY_PROXY_CONFIG_H_