Add IsOriginSecure and GURL::SchemeUsesTLS.

url/gurl.h

 // Copyright 2013 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.
 
 #ifndef URL_GURL_H_
 #define URL_GURL_H_
 
 #include <iosfwd>
 #include <string>
 
@@ skipping 205 matching lines @@
   // are often treated separately by some programs.
   bool SchemeIsFile() const {
     return SchemeIs(url::kFileScheme);
   }
 
   // FileSystem URLs need to be treated differently in some cases.
   bool SchemeIsFileSystem() const {
     return SchemeIs(url::kFileSystemScheme);
   }
 
-  // If the scheme indicates a secure connection
+  // Returns true if the scheme indicates a secure connection.
   bool SchemeIsSecure() const {
-    return SchemeIs(url::kHttpsScheme) || SchemeIs(url::kWssScheme) ||
-        (SchemeIsFileSystem() && inner_url() && inner_url()->SchemeIsSecure());
+    return SchemeIs(url::kFileScheme) || SchemeIs(url::kHttpsScheme) ||

[davidben, 2015/04/06 21:02:55]

I'm worried changing this behavior outright will break existing consumers of
this function. Quite a lot of code uses this as a shorthand for "is this HTTPS
or WSS" and "is this HTTPS" (since ws/wss aren't navigable).

Really, the filesystem: thing already makes it sad, but file: is a lot more
likely to be navigated to. At a glance, these two I don't think should include
kFileScheme.

https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/med...
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/cap...
https://code.google.com/p/chromium/codesearch#chromium/src/content/child/reso...
https://code.google.com/p/chromium/codesearch#chromium/src/net/http/http_netw...
(This isn't an exhaustive list. I just clicked through them randomly.)

Perhaps we need something like SchemeUsesSSL() which does "https or wss" and
nothing else. I almost wonder if the current SchemeIsSecure should also go into
//content since this is very much a Web Platform notion of "secure" here.

+           SchemeIs(url::kWssScheme) || (SchemeIsFileSystem() && inner_url() &&

[brettw, 2015/04/06 20:19:05]

I found the old way of SchemeIsFileSystem on the same line as the remaining
stuff was easier to read, so can you break there instead?

+                                         inner_url()->SchemeIsSecure());
   }
 
   // Returns true if the scheme is "blob".
   bool SchemeIsBlob() const {
     return SchemeIs(url::kBlobScheme);
   }
 
   // The "content" of the URL is everything after the scheme (skipping the
   // scheme delimiting colon). It is an error to get the origin of an invalid
   // URL. The result will be an empty string.
   std::string GetContent() const;
 
   // Returns true if the hostname is an IP address. Note: this function isn't
   // as cheap as a simple getter because it re-parses the hostname to verify.
-  // This currently identifies only IPv4 addresses (bug 822685).
   bool HostIsIPAddress() const;
 
   // Getters for various components of the URL. The returned string will be
   // empty if the component is empty or is not present.
   std::string scheme() const {  // Not including the colon. See also SchemeIs.
     return ComponentString(parsed_.scheme);
   }
   std::string username() const {
     return ComponentString(parsed_.username);
   }
@@ skipping 48 matching lines @@
     return parsed_.query.len >= 0;
   }
   bool has_ref() const {
     return parsed_.ref.len >= 0;
   }
 
   // Returns a parsed version of the port. Can also be any of the special
   // values defined in Parsed for ExtractPort.
   int IntPort() const;
 
-  // Returns the port number of the url, or the default port number.
+  // Returns the port number of the URL, or the default port number.
   // If the scheme has no concept of port (or unknown default) returns
   // PORT_UNSPECIFIED.
   int EffectiveIntPort() const;
 
   // Extracts the filename portion of the path and returns it. The filename
   // is everything after the last slash in the path. This may be empty.
   std::string ExtractFileName() const;
 
   // Returns the path that should be sent to the server. This is the path,
   // parameter, and query portions of the URL. It is guaranteed to be ASCII.
@@ skipping 72 matching lines @@
   // Used for nested schemes [currently only filesystem:].
   scoped_ptr<GURL> inner_url_;
 
   // TODO bug 684583: Add encoding for query params.
 };
 
 // Stream operator so GURL can be used in assertion statements.
 URL_EXPORT std::ostream& operator<<(std::ostream& out, const GURL& url);
 
 #endif  // URL_GURL_H_