Commit e86e7103 authored by Justin Donnelly's avatar Justin Donnelly Committed by Commit Bot

Remove default ftp scheme on omnibox inputs starting with "ftp.".

Support for ftp is deprecated so encouraging its use with a
special-case fixup no longer makes sense.

Bug: 798166
Change-Id: I8644164cf7229b435c1c452c74a33f26fb4543bb
Reviewed-on: https://chromium-review.googlesource.com/875201
Commit-Queue: Justin Donnelly <jdonnelly@chromium.org>
Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#531959}
parent 43681ab1
......@@ -434,12 +434,9 @@ std::string SegmentURLInternal(std::string* text, url::Parsed* parts) {
(*text)[semicolon] = ';';
}
if (!found_scheme) {
// Couldn't determine the scheme, so just pick one.
// Couldn't determine the scheme, so just default to http.
parts->scheme.reset();
scheme =
base::StartsWith(*text, "ftp.", base::CompareCase::INSENSITIVE_ASCII)
? url::kFtpScheme
: url::kHttpScheme;
scheme = url::kHttpScheme;
}
}
......
......@@ -277,12 +277,6 @@ struct FixupCase {
// a clean way to guess this isn't the new-and-exciting "user" scheme.
{"user:passwd@www.google.com:8080/", "user:passwd@www.google.com:8080/"},
// {"file:///c:/foo/bar%20baz.txt", "file:///C:/foo/bar%20baz.txt"},
{"ftp.google.com", "ftp://ftp.google.com/"},
{" ftp.google.com", "ftp://ftp.google.com/"},
{"FTP.GooGle.com", "ftp://ftp.google.com/"},
{"ftpblah.google.com", "http://ftpblah.google.com/"},
{"ftp", "http://ftp/"},
{"google.ftp.com", "http://google.ftp.com/"},
// URLs which end with 0x85 (NEL in ISO-8859).
{"http://foo.com/s?q=\xd0\x85", "http://foo.com/s?q=%D0%85"},
{"http://foo.com/s?q=\xec\x97\x85", "http://foo.com/s?q=%EC%97%85"},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment