Support WebSocket in WebRequest API.

extensions/common/url_pattern.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 "extensions/common/url_pattern.h"
 
 #include <stddef.h>
 
 #include <ostream>
 
@@ skipping 13 matching lines @@
 const char URLPattern::kAllUrlsPattern[] = "<all_urls>";
 
 namespace {
 
 // TODO(aa): What about more obscure schemes like data: and javascript: ?
 // Note: keep this array in sync with kValidSchemeMasks.
 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[] = {
   URLPattern::SCHEME_HTTP,
   URLPattern::SCHEME_HTTPS,
   URLPattern::SCHEME_FILE,
   URLPattern::SCHEME_FTP,
   URLPattern::SCHEME_CHROMEUI,
   URLPattern::SCHEME_EXTENSION,
   URLPattern::SCHEME_FILESYSTEM,
+  URLPattern::SCHEME_WS,
+  URLPattern::SCHEME_WSS,
 };
 
 static_assert(arraysize(kValidSchemes) == arraysize(kValidSchemeMasks),
               "must keep these arrays in sync");
 
 const char kParseSuccess[] = "Success.";
 const char kParseErrorMissingSchemeSeparator[] = "Missing scheme separator.";
 const char kParseErrorInvalidScheme[] = "Invalid scheme.";
 const char kParseErrorWrongSchemeType[] = "Wrong scheme type.";
 const char kParseErrorEmptyHost[] = "Host can not be empty.";
@@ skipping 257 matching lines @@
 
 void URLPattern::SetMatchSubdomains(bool val) {
   spec_.clear();
   match_subdomains_ = val;
 }
 
 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 want most APIs to be able to
(try to) do anything with ws:/wss: schemes.  I'd be inclined to say we should
have them specify them explicitly separately, as we do for other "unusual"
schemes.

[pkalinnikov, 2017/02/14 13:49:51]

SGTM.

   } else if (!IsValidScheme(scheme_)) {
     return false;
   }
   return true;
 }
 
 bool URLPattern::IsValidScheme(base::StringPiece scheme) const {
   if (valid_schemes_ == SCHEME_ALL)
     return true;
 
@@ skipping 291 matching lines @@
   }
 
   return result;
 }
 
 // static
 const char* URLPattern::GetParseResultString(
     URLPattern::ParseResult parse_result) {
   return kParseResultMessages[parse_result];
 }