Changes FormatURL to not strip http if the host starts with ftp or https[!a-z]. This...

net/base/net_util.cc

 // Copyright (c) 2010 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/base/net_util.h"
 
 #include <algorithm>
 #include <map>
 #include <unicode/ucnv.h>
 #include <unicode/uidna.h>
@@ skipping 1374 matching lines @@
 std::wstring FormatUrl(const GURL& url,
                        const std::wstring& languages,
                        FormatUrlTypes format_types,
                        UnescapeRule::Type unescape_rules,
                        url_parse::Parsed* new_parsed,
                        size_t* prefix_end,
                        size_t* offset_for_adjustment) {
   url_parse::Parsed parsed_temp;
   if (!new_parsed)
     new_parsed = &parsed_temp;
+  else
+    *new_parsed = url_parse::Parsed();
   size_t offset_temp = std::wstring::npos;
   if (!offset_for_adjustment)
     offset_for_adjustment = &offset_temp;
 
   std::wstring url_string;
 
   // Check for empty URLs or 0 available text width.
   if (url.is_empty()) {
     if (prefix_end)
       *prefix_end = 0;
@@ skipping 20 matching lines @@
     *offset_for_adjustment = std::wstring::npos;
 
   // Copy everything before the username (the scheme and the separators.)
   // These are ASCII.
   std::copy(spec.begin(),
       spec.begin() + parsed.CountCharactersBefore(url_parse::Parsed::USERNAME,
                                                   true),
       std::back_inserter(url_string));
 
   const wchar_t* const kHTTP = L"http://";
+  const char* const kFTP = "ftp.";
   const size_t kHTTPSize = std::wstring(kHTTP).size();
-  bool omit_http = ((format_types & kFormatUrlOmitHTTP) != 0 &&
-                    url_string == kHTTP);
+  // The omnibox treats ftp.foo.com as ftp://foo.com. This means that if we
+  // trimmed http off a string that starts with http://ftp and the user tried to
+  // reload the page the user would end up with a scheme of ftp://. For example,
+  // 'http://ftp.foo.com' -> 'ftp.foo.com' -> 'ftp://foo.com'. For this reason
+  // don't strip http off url's whose scheme is http and the host starts with
+  // 'ftp.'.
+  bool omit_http =
+      ((format_types & kFormatUrlOmitHTTP) != 0 &&
+       url_string == kHTTP && (!parsed.host.is_valid() ||
+                               (parsed.host.is_nonempty() &&
+                                spec.compare(parsed.host.begin,
+                                             std::string(kFTP).size(), kFTP))));
 
   new_parsed->scheme = parsed.scheme;
 
   if ((format_types & kFormatUrlOmitUsernamePassword) != 0) {
     // Remove the username and password fields. We don't want to display those
     // to the user since they can be used for attacks,
     // e.g. "http://google.com:search@evil.ru/"
     new_parsed->username.reset();
     new_parsed->password.reset();
     if ((*offset_for_adjustment != std::wstring::npos) &&
@@ skipping 271 matching lines @@
 
   IPv6SupportResults(IPV6_GLOBAL_ADDRESS_MISSING);
   return false;
 #else
   NOTIMPLEMENTED();
   return true;
 #endif  // defined(various platforms)
 }
 
 }  // namespace net