Omnibox UI Experiments: Refactor HTTPS trimming into UrlFormatter.

components/omnibox/browser/autocomplete_match_unittest.cc

 // Copyright 2014 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/omnibox/browser/autocomplete_match.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 93 matching lines @@
   // Test an arbitrary complicated case.
   EXPECT_EQ("0,2," "1,0," "2,1," "4,3," "5,7," "6,3," "7,7," "15,1," "17,0",
       AutocompleteMatch::ClassificationsToString(
           AutocompleteMatch::MergeClassifications(
               AutocompleteMatch::ClassificationsFromString(
                   "0,0," "2,1," "4,3," "7,7," "10,6," "15,0"),
               AutocompleteMatch::ClassificationsFromString(
                   "0,2," "1,0," "5,7," "6,1," "17,0"))));
 }
 
-TEST(AutocompleteMatchTest, FormatUrlForSuggestionDisplay) {
-  struct FormatUrlTestData {
-    const std::string url;
-    bool trim_scheme;
-    size_t offset_for_adjustment;
-    const std::string expected_result;
-    size_t expected_adjusted_offset;
+TEST(AutocompleteMatchTest, GetFormatForSuggestionDisplay) {

[Peter Kasting, 2017/06/29 01:05:44]

It's OK I guess, but this test does seem a bit change-detector-y.  If we inline
this function, for example, the test disappears.  I would think it might be
better to just look at how the match strings are formatted for display; we have
to check that anyway, and once we do, checking this underlying bit seems
unnecessary.

[tommycli, 2017/06/29 16:46:46]

Done. No problem. I changed it back to just sanity-check that the feature flags
and the trim_strings parameter work

+  EXPECT_EQ(
+      url_formatter::kFormatUrlOmitAll,
+      AutocompleteMatch::GetFormatForSuggestionDisplay(true /* trim_scheme */));
+  EXPECT_EQ(
+      url_formatter::kFormatUrlOmitAll & ~url_formatter::kFormatUrlOmitHTTP,
+      AutocompleteMatch::GetFormatForSuggestionDisplay(
+          false /* trim_scheme */));
 
-    void Validate() {
-      SCOPED_TRACE(testing::Message()
-                   << " url= " << url << " trim_scheme=" << trim_scheme
-                   << " offset_for_adjustment=" << offset_for_adjustment
-                   << " expected_result=" << expected_result
-                   << " expected_adjusted_offset=" << expected_adjusted_offset);
-
-      size_t offset_result = offset_for_adjustment;
-      base::string16 result = AutocompleteMatch::FormatUrlForSuggestionDisplay(
-          GURL(url), trim_scheme, &offset_result);
-
-      EXPECT_EQ(expected_result, base::UTF16ToASCII(result));
-      EXPECT_EQ(expected_adjusted_offset, offset_result);
-    };
-  };
-
-  FormatUrlTestData normal_cases[] = {
-      {"http://google.com", true, 9, "google.com", 2},
-      {"https://google.com", true, 9, "https://google.com", 9},
-      {"http://google.com", false, 9, "http://google.com", 9},
-      {"https://google.com", false, 9, "https://google.com", 9},
-  };
-  for (size_t i = 0; i < arraysize(normal_cases); ++i) {
-    normal_cases[i].Validate();
-  }
-
+  // Test the hide scheme feature flag.
   std::unique_ptr<base::test::ScopedFeatureList> feature_list(
       new base::test::ScopedFeatureList);
   feature_list->InitAndEnableFeature(
       omnibox::kUIExperimentHideSuggestionUrlScheme);
 
-  FormatUrlTestData omit_scheme_cases[] = {
-      {"http://google.com", true, 9, "google.com", 2},
-      {"https://google.com", true, 9, "google.com", 1},
-      {"https://username:password@google.com", true, 9, "google.com",
-       base::string16::npos},
-      {"https://username:password@google.com", true, 29, "google.com", 3},
-      {"http://google.com", false, 9, "http://google.com", 9},
-      {"https://google.com", false, 9, "https://google.com", 9},
-      {"http://username:password@google.com", false, 9, "http://google.com",
-       base::string16::npos},
-  };
-  for (size_t i = 0; i < arraysize(omit_scheme_cases); ++i) {
-    omit_scheme_cases[i].Validate();
-  }
+  EXPECT_EQ(
+      url_formatter::kFormatUrlOmitAll |
+          url_formatter::kFormatUrlExperimentalOmitHTTPS,
+      AutocompleteMatch::GetFormatForSuggestionDisplay(true /* trim_scheme */));
+  EXPECT_EQ(
+      url_formatter::kFormatUrlOmitAll & ~url_formatter::kFormatUrlOmitHTTP,
+      AutocompleteMatch::GetFormatForSuggestionDisplay(
+          false /* trim_scheme */));
 }
 
 TEST(AutocompleteMatchTest, SupportsDeletion) {
   // A non-deletable match with no duplicates.
   AutocompleteMatch m(NULL, 0, false,
                       AutocompleteMatchType::URL_WHAT_YOU_TYPED);
   EXPECT_FALSE(m.SupportsDeletion());
 
   // A deletable match with no duplicates.
   AutocompleteMatch m1(NULL, 0, true,
@@ skipping 75 matching lines @@
     m1.destination_url = GURL(cases[i].url1);
     m1.ComputeStrippedDestinationURL(input, nullptr);
     AutocompleteMatch m2(nullptr, 100, false,
                          AutocompleteMatchType::URL_WHAT_YOU_TYPED);
     m2.destination_url = GURL(cases[i].url2);
     m2.ComputeStrippedDestinationURL(input, nullptr);
     EXPECT_EQ(cases[i].expected_duplicate,
               AutocompleteMatch::DestinationsEqual(m1, m2));
   }
 }