Omnibox UI Experiments: Refactor HTTPS trimming into UrlFormatter.

components/omnibox/browser/titled_url_match_utils.cc

 // Copyright (c) 2017 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/titled_url_match_utils.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/bookmarks/browser/titled_url_node.h"
 #include "components/omnibox/browser/autocomplete_match.h"
@@ skipping 67 matching lines @@
   const bool trim_http =
       !AutocompleteInput::HasHTTPScheme(input.text()) &&
       ((match_start == base::string16::npos) || (match_start != 0));
   std::vector<size_t> offsets = TitledUrlMatch::OffsetsFromMatchPositions(
       titled_url_match.url_match_positions);
   // In addition to knowing how |offsets| is transformed, we need to know how
   // |inline_autocomplete_offset| is transformed.  We add it to the end of
   // |offsets|, compute how everything is transformed, then remove it from the
   // end.
   offsets.push_back(inline_autocomplete_offset);
-  match.contents = AutocompleteMatch::FormatUrlForSuggestionDisplayWithOffsets(
-      url, trim_http, &offsets);
+  auto format_types = AutocompleteMatch::GetFormatTypes(trim_http);
+  match.contents = url_formatter::FormatUrlWithOffsets(
+      url, format_types, net::UnescapeRule::SPACES, nullptr, nullptr, &offsets);
   inline_autocomplete_offset = offsets.back();
   offsets.pop_back();
   TitledUrlMatch::MatchPositions new_url_match_positions =
       TitledUrlMatch::ReplaceOffsetsInMatchPositions(
           titled_url_match.url_match_positions, offsets);
   match.contents_class = ClassificationsFromMatchPositions(
       new_url_match_positions, match.contents.size(), true);
   match.fill_into_edit =
       AutocompleteInput::FormattedStringWithEquivalentMeaning(
           url, match.contents, scheme_classifier);
@@ skipping 27 matching lines @@
     return;
   for (TitledUrlMatch::MatchPositions::iterator it =
            title_match_positions->begin();
        it != title_match_positions->end(); ++it) {
     it->first -= leading_whitespace_chars;
     it->second -= leading_whitespace_chars;
   }
 }
 
 }  // namespace bookmarks