Index: net/http/http_util_icu.cc |
diff --git a/net/http/http_util_icu.cc b/net/http/http_util_icu.cc |
index 4f38f84d75bac2bc52f005885f454a69ab5b1b2e..6aa41f39ba8a4716986134af83e61f794cb01d67 100644 |
--- a/net/http/http_util_icu.cc |
+++ b/net/http/http_util_icu.cc |
@@ -14,7 +14,8 @@ namespace net { |
// static |
std::string HttpUtil::PathForRequest(const GURL& url) { |
- DCHECK(url.is_valid() && url.SchemeIsHTTPOrHTTPS()); |
+ DCHECK(url.is_valid() && (url.SchemeIsHTTPOrHTTPS() || |
+ SchemeIsWsOrWss(url))); |
if (url.has_query()) |
return url.path() + "?" + url.query(); |
return url.path(); |
@@ -23,9 +24,14 @@ std::string HttpUtil::PathForRequest(const GURL& url) { |
// static |
std::string HttpUtil::SpecForRequest(const GURL& url) { |
// We may get ftp scheme when fetching ftp resources through proxy. |
- DCHECK(url.is_valid() && (url.SchemeIsHTTPOrHTTPS() || |
- url.SchemeIs("ftp"))); |
+ DCHECK(url.is_valid() && (url.SchemeIsHTTPOrHTTPS() || url.SchemeIs("ftp") || |
+ SchemeIsWsOrWss(url))); |
return SimplifyUrlForRequest(url).spec(); |
} |
+// static |
+bool HttpUtil::SchemeIsWsOrWss(const GURL& url) { |
+ return url.SchemeIs("ws") || url.SchemeIs("wss"); |
+} |
+ |
} // namespace net |