Fix HTTP protocol scheme debugging checks for WebSockets

net/http/http_auth_cache.cc

 // Copyright (c) 2011 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/http/http_auth_cache.h"
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
+#include "net/http/http_util.h"
+
+namespace net {
 
 namespace {
 
 // Helper to find the containing directory of path. In RFC 2617 this is what
 // they call the "last symbolic element in the absolute path".
 // Examples:
 //   "/foo/bar.txt" --> "/foo/"
 //   "/foo/" --> "/foo/"
 std::string GetParentDirectory(const std::string& path) {
   std::string::size_type last_slash = path.rfind("/");
@@ skipping 17 matching lines @@
 bool IsEnclosingPath(const std::string& container, const std::string& path) {
   DCHECK(container.empty() || *(container.end() - 1) == '/');
   return ((container.empty() && path.empty()) ||
           (!container.empty() && StartsWithASCII(path, container, true)));
 }
 
 // Debug helper to check that |origin| arguments are properly formed.
 void CheckOriginIsValid(const GURL& origin) {
   DCHECK(origin.is_valid());
   // Note that the scheme may be FTP when we're using a HTTP proxy.
-  DCHECK(origin.SchemeIsHTTPOrHTTPS() || origin.SchemeIs("ftp"));
+  DCHECK(origin.SchemeIsHTTPOrHTTPS() || origin.SchemeIs("ftp") ||
+         HttpUtil::SchemeIsWsOrWss(origin));

[szym, 2013/11/19 02:42:50]

Add SchemeIsWSOrWSS to GURL.

[Adam Rice, 2013/11/19 03:56:44]

Done.

   DCHECK(origin.GetOrigin() == origin);
 }
 
 // Functor used by remove_if.
 struct IsEnclosedBy {
   explicit IsEnclosedBy(const std::string& path) : path(path) { }
   bool operator() (const std::string& x) const {
     return IsEnclosingPath(path, x);
   }
   const std::string& path;
 };
 
 }  // namespace
 
-namespace net {
-
 HttpAuthCache::HttpAuthCache() {
 }
 
 HttpAuthCache::~HttpAuthCache() {
 }
 
 // Performance: O(n), where n is the number of realm entries.
 HttpAuthCache::Entry* HttpAuthCache::Lookup(const GURL& origin,
                                             const std::string& realm,
                                             HttpAuth::Scheme scheme) {
@@ skipping 161 matching lines @@
     // Copy all other paths.
     for (Entry::PathList::const_reverse_iterator it2 = ++it->paths_.rbegin();
          it2 != it->paths_.rend(); ++it2)
       entry->AddPath(*it2);
     // Copy nonce count (for digest authentication).
     entry->nonce_count_ = it->nonce_count_;
   }
 }
 
 }  // namespace net