Merge to M39: Correct manual proxy selection for WebSockets.

net/proxy/proxy_config.cc

 // 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.
 
 #include "net/proxy/proxy_config.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/values.h"
@@ skipping 127 matching lines @@
     }
   }
 }
 
 const ProxyList* ProxyConfig::ProxyRules::MapUrlSchemeToProxyList(
     const std::string& url_scheme) const {
   const ProxyList* proxy_server_list = const_cast<ProxyRules*>(this)->
       MapUrlSchemeToProxyListNoFallback(url_scheme);
   if (proxy_server_list && !proxy_server_list->IsEmpty())
     return proxy_server_list;
+  if (url_scheme == "ws" || url_scheme == "wss")
+    return GetProxyListForWebSocketScheme();
   if (!fallback_proxies.IsEmpty())
     return &fallback_proxies;
   return NULL;  // No mapping for this scheme. Use direct.
 }
 
 bool ProxyConfig::ProxyRules::Equals(const ProxyRules& other) const {
   return type == other.type &&
          single_proxies.Equals(other.single_proxies) &&
          proxies_for_http.Equals(other.proxies_for_http) &&
          proxies_for_https.Equals(other.proxies_for_https) &&
          proxies_for_ftp.Equals(other.proxies_for_ftp) &&
          fallback_proxies.Equals(other.fallback_proxies) &&
          bypass_rules.Equals(other.bypass_rules) &&
          reverse_bypass == other.reverse_bypass;
 }
 
 ProxyList* ProxyConfig::ProxyRules::MapUrlSchemeToProxyListNoFallback(
     const std::string& scheme) {
   DCHECK_EQ(TYPE_PROXY_PER_SCHEME, type);
   if (scheme == "http")
     return &proxies_for_http;
   if (scheme == "https")
     return &proxies_for_https;
   if (scheme == "ftp")
     return &proxies_for_ftp;
   return NULL;  // No mapping for this scheme.
 }
 
+const ProxyList* ProxyConfig::ProxyRules::GetProxyListForWebSocketScheme()
+    const {
+  if (!fallback_proxies.IsEmpty())
+    return &fallback_proxies;
+  if (!proxies_for_https.IsEmpty())
+    return &proxies_for_https;
+  if (!proxies_for_http.IsEmpty())
+    return &proxies_for_http;
+  return NULL;
+}
+
 ProxyConfig::ProxyConfig()
     : auto_detect_(false), pac_mandatory_(false),
       source_(PROXY_CONFIG_SOURCE_UNKNOWN), id_(kInvalidConfigID)  {
 }
 
 ProxyConfig::ProxyConfig(const ProxyConfig& config)
     : auto_detect_(config.auto_detect_),
       pac_url_(config.pac_url_),
       pac_mandatory_(config.pac_mandatory_),
       proxy_rules_(config.proxy_rules_),
@@ skipping 82 matching lines @@
     }
   }
 
   // Output the source.
   dict->SetString("source", ProxyConfigSourceToString(source_));
 
   return dict;
 }
 
 }  // namespace net