Switch remaining functions from SchemeIsSecure() to SchemeIsCryptographic().

net/cookies/canonical_cookie.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.
 
 // Portions of this code based on Mozilla:
 //   (netwerk/cookie/src/nsCookieService.cpp)
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
@@ skipping 169 matching lines @@
 
 CanonicalCookie::~CanonicalCookie() {
 }
 
 std::string CanonicalCookie::GetCookieSourceFromURL(const GURL& url) {
   if (url.SchemeIsFile())
     return url.spec();
 
   url::Replacements<char> replacements;
   replacements.ClearPort();
-  if (url.SchemeIsSecure())
+  if (url.SchemeIsCryptographic())
     replacements.SetScheme("http", url::Component(0, 4));
 
   return url.GetOrigin().ReplaceComponents(replacements).spec();
 }
 
 // static
 std::string CanonicalCookie::CanonPath(const GURL& url,
                                        const ParsedCookie& pc) {
   std::string path_string;
   if (pc.HasPath())
@@ skipping 187 matching lines @@
                        domain_.length(), domain_) == 0);
 }
 
 bool CanonicalCookie::IncludeForRequestURL(const GURL& url,
                                            const CookieOptions& options) const {
   // Filter out HttpOnly cookies, per options.
   if (options.exclude_httponly() && IsHttpOnly())
     return false;
   // Secure cookies should not be included in requests for URLs with an
   // insecure scheme.
-  if (IsSecure() && !url.SchemeIsSecure())
+  if (IsSecure() && !url.SchemeIsCryptographic())

[palmer, 2015/04/24 19:55:11]

This is a semantic change. It might be a change from the right semantics to the
wrong semantics (in which case we don't want to do it), or from the wrong
semantics to the right semantics (in which case this change fixes a bug
— possibly already filed, possibly not). "git blame" shows the owner of this
code is markusheintz; let's ask him.

     return false;
   // Don't include cookies for requests that don't apply to the cookie domain.
   if (!IsDomainMatch(url.host()))
     return false;
   // Don't include cookies for requests with a url path that does not path
   // match the cookie-path.
   if (!IsOnPath(url.path()))
     return false;
 
   // Include first-party-only cookies iff |options| tells us to include all of
@@ skipping 45 matching lines @@
   if (IsSecure() != other.IsSecure())
     return IsSecure();
 
   if (IsHttpOnly() != other.IsHttpOnly())
     return IsHttpOnly();
 
   return Priority() < other.Priority();
 }
 
 }  // namespace net