Omnibox UI Experiments: Hook up elide-after-host feature flag.

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 97 matching lines @@
               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;
-    const std::string expected_result;
+    const wchar_t* expected_result;
 
     void Validate() {
       SCOPED_TRACE(testing::Message()
                    << " url= " << url << " trim_scheme=" << trim_scheme
                    << " expected_result=" << expected_result);
       auto format_types = AutocompleteMatch::GetFormatTypes(trim_scheme);
-      EXPECT_EQ(expected_result,
-                base::UTF16ToASCII(url_formatter::FormatUrl(
-                    GURL(url), format_types, net::UnescapeRule::SPACES, nullptr,
-                    nullptr, nullptr)));
+      EXPECT_EQ(base::WideToUTF16(expected_result),
+                url_formatter::FormatUrl(GURL(url), format_types,
+                                         net::UnescapeRule::SPACES, nullptr,
+                                         nullptr, nullptr));
     };
   };
 
-  // Sanity check that the trim_strings parameter works.
   FormatUrlTestData normal_cases[] = {
-      {"http://google.com", true, "google.com"},
-      {"https://google.com", true, "https://google.com"},
-      {"http://google.com", false, "http://google.com"},
-      {"https://google.com", false, "https://google.com"},
+      // Sanity check that the trim_scheme parameter works.
+      {"http://google.com", true, L"google.com"},
+      {"https://google.com", true, L"https://google.com"},
+      {"http://google.com", false, L"http://google.com"},
+      {"https://google.com", false, L"https://google.com"},
+
+      // Test that paths are preserved in the default case.
+      {"http://google.com/foobar", true, L"google.com/foobar"},
   };
   for (FormatUrlTestData& test_case : normal_cases)
     test_case.Validate();
 
-  // Test the hide-scheme feature flag.
+  // Test the hide-scheme feature flag with the trim_scheme parameter.
   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, "google.com"},
-      {"https://google.com", true, "google.com"},
-      {"http://google.com", false, "http://google.com"},
-      {"https://google.com", false, "https://google.com"},
+      {"http://google.com", true, L"google.com"},
+      {"https://google.com", true, L"google.com"},
+      {"http://google.com", false, L"http://google.com"},
+      {"https://google.com", false, L"https://google.com"},
   };
   for (FormatUrlTestData& test_case : omit_scheme_cases)
     test_case.Validate();
+
+  // Test the elide-after-host feature flag.
+  feature_list.reset(new base::test::ScopedFeatureList);
+  feature_list->InitAndEnableFeature(
+      omnibox::kUIExperimentElideSuggestionUrlAfterHost);
+  FormatUrlTestData hide_path_case = {"http://google.com/foobar", true,
+                                      L"google.com/\x2026\x0000"};

[Mark P, 2017/07/05 18:38:45]

Care to test the case when we're not hiding the scheme as well?

[tommycli, 2017/07/05 19:38:26]

Done.

+  hide_path_case.Validate();
 }
 
 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));
   }
 }