Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Unified Diff: extensions/common/url_pattern.cc

Issue 2449913002: Support WebSocket in WebRequest API. (Closed)
Patch Set: Refactor tests; add test; update documentation. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/common/url_pattern.cc
diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc
index fcd50f676dcf709777b3df33894adeecd3b213e9..af7ed375febfbcd433c1b9b45dc8a0910b1cae36 100644
--- a/extensions/common/url_pattern.cc
+++ b/extensions/common/url_pattern.cc
@@ -31,7 +31,8 @@ const char* const kValidSchemes[] = {
url::kHttpScheme, url::kHttpsScheme,
url::kFileScheme, url::kFtpScheme,
content::kChromeUIScheme, extensions::kExtensionScheme,
- url::kFileSystemScheme,
+ url::kFileSystemScheme, url::kWsScheme,
+ url::kWssScheme,
};
const int kValidSchemeMasks[] = {
@@ -42,6 +43,8 @@ const int kValidSchemeMasks[] = {
URLPattern::SCHEME_CHROMEUI,
URLPattern::SCHEME_EXTENSION,
URLPattern::SCHEME_FILESYSTEM,
+ URLPattern::SCHEME_WS,
+ URLPattern::SCHEME_WSS,
};
static_assert(arraysize(kValidSchemes) == arraysize(kValidSchemeMasks),
@@ -319,7 +322,7 @@ bool URLPattern::SetScheme(base::StringPiece scheme) {
spec_.clear();
scheme.CopyToString(&scheme_);
if (scheme_ == "*") {
- valid_schemes_ &= (SCHEME_HTTP | SCHEME_HTTPS);
+ valid_schemes_ &= (SCHEME_HTTP | SCHEME_HTTPS | SCHEME_WS | SCHEME_WSS);
Devlin 2017/02/14 01:21:38 Hmm... I'm not sure this is preferable. We don't
pkalinnikov 2017/02/14 13:49:51 SGTM.
} else if (!IsValidScheme(scheme_)) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698