Omnibox UI Experiments: Refactor HTTPS trimming into UrlFormatter.

components/omnibox/browser/history_quick_provider.cc

Index: components/omnibox/browser/history_quick_provider.cc
diff --git a/components/omnibox/browser/history_quick_provider.cc b/components/omnibox/browser/history_quick_provider.cc
index f8b9a767873392d2c9ba4774d7fd0e52c1f95262..2768387e4810565582c6bf9cc3192a70b3454008 100644
--- a/components/omnibox/browser/history_quick_provider.cc
+++ b/components/omnibox/browser/history_quick_provider.cc
@@ -201,9 +201,11 @@ AutocompleteMatch HistoryQuickProvider::QuickMatchToACMatch(
       false, base::UTF8ToUTF16(info.url().spec()));
 
   base::OffsetAdjuster::Adjustments adjustments;
-  match.contents =
-      AutocompleteMatch::FormatUrlForSuggestionDisplayWithAdjustments(
-          info.url(), !history_match.match_in_scheme, &adjustments);
+  auto format_types =
+      AutocompleteMatch::GetFormatTypes(!history_match.match_in_scheme);
+  match.contents = url_formatter::FormatUrlWithAdjustments(
+      info.url(), format_types, net::UnescapeRule::SPACES, nullptr, nullptr,
+      &adjustments);
   match.fill_into_edit =
       AutocompleteInput::FormattedStringWithEquivalentMeaning(
           info.url(), match.contents, client()->GetSchemeClassifier());