Omnibox UI Experiments: Implement scheme-trimming for suggested URLs.

components/omnibox/browser/titled_url_match_utils.cc

Index: components/omnibox/browser/titled_url_match_utils.cc
diff --git a/components/omnibox/browser/titled_url_match_utils.cc b/components/omnibox/browser/titled_url_match_utils.cc
index f60d0d5aa075265e716ed903e3769204963736f1..8c6063065dccf592f2411d8fdc30965e51da1ae4 100644
--- a/components/omnibox/browser/titled_url_match_utils.cc
+++ b/components/omnibox/browser/titled_url_match_utils.cc
@@ -85,10 +85,8 @@ AutocompleteMatch TitledUrlMatchToAutocompleteMatch(
   // |offsets|, compute how everything is transformed, then remove it from the
   // end.
   offsets.push_back(inline_autocomplete_offset);
-  match.contents = url_formatter::FormatUrlWithOffsets(
-      url, url_formatter::kFormatUrlOmitAll &
-               ~(trim_http ? 0 : url_formatter::kFormatUrlOmitHTTP),
-      net::UnescapeRule::SPACES, nullptr, nullptr, &offsets);
+  match.contents = AutocompleteMatch::FormatUrlForSuggestionDisplayWithOffsets(
+      url, trim_http, &offsets);
   inline_autocomplete_offset = offsets.back();
   offsets.pop_back();
   TitledUrlMatch::MatchPositions new_url_match_positions =