Omnibox UI Experiments: Refactor HTTPS trimming into UrlFormatter.

components/url_formatter/url_formatter_unittest.cc

 // Copyright 2015 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 "components/url_formatter/url_formatter.h"
 
 #include <stddef.h>
 #include <string.h>
 
 #include <vector>
@@ skipping 807 matching lines @@
 
       /*
       {"unescape=true with some special characters",
       "http://user%3A:%40passwd@example.com/foo%3Fbar?q=b%26z",
       kFormatUrlOmitNothing, net::UnescapeRule::NORMAL,
       L"http://user%3A:%40passwd@example.com/foo%3Fbar?q=b%26z", 25},
       */
       // Disabled: the resultant URL becomes "...user%253A:%2540passwd...".
 
       // -------- omit http: --------
+      {"omit http", "http://www.google.com/", kFormatUrlOmitHTTP,
+       net::UnescapeRule::NORMAL, L"www.google.com/", 0},
+
+      {"omit http on bare scheme", "http://", kFormatUrlOmitAll,
+       net::UnescapeRule::NORMAL, L"", 0},
+
       {"omit http with user name", "http://user@example.com/foo",
        kFormatUrlOmitAll, net::UnescapeRule::NORMAL, L"example.com/foo", 0},
 
-      {"omit http", "http://www.google.com/", kFormatUrlOmitHTTP,
-       net::UnescapeRule::NORMAL, L"www.google.com/", 0},
-
       {"omit http with https", "https://www.google.com/", kFormatUrlOmitHTTP,
        net::UnescapeRule::NORMAL, L"https://www.google.com/", 8},
 
       {"omit http starts with ftp.", "http://ftp.google.com/",
        kFormatUrlOmitHTTP, net::UnescapeRule::NORMAL, L"http://ftp.google.com/",
        7},
 
       // -------- omit trailing slash on bare hostname --------
       {"omit slash when it's the entire path", "http://www.google.com/",
        kFormatUrlOmitTrailingSlashOnBareHostname, net::UnescapeRule::NORMAL,
@@ skipping 62 matching lines @@
        kFormatUrlOmitAll | kFormatUrlExperimentalElideAfterHost,
        net::UnescapeRule::NORMAL, L"google.com/\x2026\x0000", 0},
       {"elide after host with path, query and ref",
        "http://google.com/foo?a=b#c",
        kFormatUrlOmitAll | kFormatUrlExperimentalElideAfterHost,
        net::UnescapeRule::NORMAL, L"google.com/\x2026\x0000", 0},
       {"elide after host with repeated delimiters (sanity check)",
        "http://google.com////???####",
        kFormatUrlOmitAll | kFormatUrlExperimentalElideAfterHost,
        net::UnescapeRule::NORMAL, L"google.com/\x2026\x0000", 0},
+
+      // -------- omit https --------
+      {"omit https", "https://www.google.com/", kFormatUrlExperimentalOmitHTTPS,
+       net::UnescapeRule::NORMAL, L"www.google.com/", 0},
+      {"omit https but do not omit http", "http://www.google.com/",
+       kFormatUrlExperimentalOmitHTTPS, net::UnescapeRule::NORMAL,
+       L"http://www.google.com/", 7},
+      {"omit https, username, and password",
+       "https://user:password@example.com/foo",
+       kFormatUrlOmitAll | kFormatUrlExperimentalOmitHTTPS,
+       net::UnescapeRule::NORMAL, L"example.com/foo", 0},
+      {"omit https, but preserve user name and password",
+       "https://user:password@example.com/foo", kFormatUrlExperimentalOmitHTTPS,
+       net::UnescapeRule::NORMAL, L"user:password@example.com/foo", 14},
+      {"omit https should not affect hosts starting with ftp.",
+       "https://ftp.google.com/",
+       kFormatUrlOmitHTTP | kFormatUrlExperimentalOmitHTTPS,
+       net::UnescapeRule::NORMAL, L"https://ftp.google.com/", 8},
   };
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     size_t prefix_len;
     base::string16 formatted = FormatUrl(
         GURL(tests[i].input), tests[i].format_types, tests[i].escape_rules,
         nullptr,  &prefix_len, nullptr);
     EXPECT_EQ(WideToUTF16(tests[i].output), formatted) << tests[i].description;
     EXPECT_EQ(tests[i].prefix_len, prefix_len) << tests[i].description;
   }
@@ skipping 344 matching lines @@
                        net::UnescapeRule::NORMAL, elide_after_host_offsets);
   CheckAdjustedOffsets("http://foo.com/abc#def",
                        kFormatUrlOmitAll | kFormatUrlExperimentalElideAfterHost,
                        net::UnescapeRule::NORMAL, elide_after_host_offsets);
   CheckAdjustedOffsets("http://foo.com/a?a=b#f",
                        kFormatUrlOmitAll | kFormatUrlExperimentalElideAfterHost,
                        net::UnescapeRule::NORMAL, elide_after_host_offsets);
   CheckAdjustedOffsets("http://foo.com//??###",
                        kFormatUrlOmitAll | kFormatUrlExperimentalElideAfterHost,
                        net::UnescapeRule::NORMAL, elide_after_host_offsets);
+
+  const size_t omit_https_offsets[] = {
+      0, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 0,  1,  2, 3,
+      4, 5,     6,     7,     8,     9,     10,    11,    12, 13, 14};
+  CheckAdjustedOffsets("https://www.google.com/",
+                       kFormatUrlExperimentalOmitHTTPS,
+                       net::UnescapeRule::NORMAL, omit_https_offsets);
+
+  const size_t omit_https_with_auth_offsets[] = {
+      0,     kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, kNpos, 0,
+      kNpos, kNpos, kNpos, 0,     1,     2,     3,     4,     5,
+      6,     7,     8,     9,     10,    11,    12,    13,    14};
+  CheckAdjustedOffsets("https://u:p@www.google.com/",
+                       kFormatUrlOmitAll | kFormatUrlExperimentalOmitHTTPS,
+                       net::UnescapeRule::NORMAL, omit_https_with_auth_offsets);
 }
 
 }  // namespace
 
 }  // namespace url_formatter