Remove some lingering support for FTP from HTTP proxies.

Change-Id: I787964b93b8f96200172d01b52f8865de2679c12
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1629014Reviewed-by: Matt Menke <mmenke@chromium.org>
Commit-Queue: Eric Roman <eroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663967}

net/http/http_auth_cache.cc

@@ -45,9 +45,7 @@ bool IsEnclosingPath(const std::string& container, const std::string& path) {
 // 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") ||
-         origin.SchemeIsWSOrWSS());
+  DCHECK(origin.SchemeIsHTTPOrHTTPS() || origin.SchemeIsWSOrWSS());
   DCHECK(origin.GetOrigin() == origin);
 }
 

net/http/http_stream_factory_job.cc

@@ -1084,11 +1084,9 @@ int HttpStreamFactory::Job::DoCreateStream() {
 
   if (!using_spdy_) {
     DCHECK(!expect_spdy_);
-    // We may get ftp scheme when fetching ftp resources through proxy.
     bool using_proxy = (proxy_info_.is_http() || proxy_info_.is_https() ||
                         proxy_info_.is_quic()) &&
-                       (request_info_.url.SchemeIs(url::kHttpScheme) ||
-                        request_info_.url.SchemeIs(url::kFtpScheme));
+                       request_info_.url.SchemeIs(url::kHttpScheme);
     if (is_websocket_) {
       DCHECK_NE(job_type_, PRECONNECT);
       DCHECK(delegate_->websocket_handshake_stream_create_helper());

net/http/http_util.cc

@@ -83,9 +83,8 @@ std::string GetBaseLanguageCode(const std::string& language_code) {
 
 // static
 std::string HttpUtil::SpecForRequest(const GURL& url) {
-  // We may get ftp scheme when fetching ftp resources through proxy.
-  DCHECK(url.is_valid() && (url.SchemeIsHTTPOrHTTPS() || url.SchemeIs("ftp") ||
-                            url.SchemeIsWSOrWSS()));
+  DCHECK(url.is_valid() &&
+         (url.SchemeIsHTTPOrHTTPS() || url.SchemeIsWSOrWSS()));
   return SimplifyUrlForRequest(url).spec();
 }
 

net/http/http_util_unittest.cc

@@ -734,13 +734,6 @@ TEST(HttpUtilTest, RequestUrlSanitize) {
   }
 }
 
-// Test SpecForRequest() for "ftp" scheme.
-TEST(HttpUtilTest, SpecForRequestForUrlWithFtpScheme) {
-  GURL ftp_url("ftp://user:pass@google.com/pub/chromium/");
-  EXPECT_EQ("ftp://google.com/pub/chromium/",
-            HttpUtil::SpecForRequest(ftp_url));
-}
-
 TEST(HttpUtilTest, GenerateAcceptLanguageHeader) {
   std::string header = HttpUtil::GenerateAcceptLanguageHeader("");
   EXPECT_TRUE(header.empty());