Omnibox UI Experiments: Refactor HTTPS trimming into UrlFormatter.

components/omnibox/browser/clipboard_url_provider.cc

 // Copyright 2015 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/clipboard_url_provider.h"
 
 #include <algorithm>
 
 #include "base/feature_list.h"
 #include "base/logging.h"
@@ skipping 68 matching lines @@
     current_url_suggested_ = url;
     current_url_suggested_times_ = 1;
   }
   UMA_HISTOGRAM_SPARSE_SLOWLY(
       "Omnibox.ClipboardSuggestionShownNumTimes",
       std::min(current_url_suggested_times_, static_cast<size_t>(20)));
 
   // Add the clipboard match. The relevance is 800 to beat ZeroSuggest results.
   AutocompleteMatch match(this, 800, false, AutocompleteMatchType::CLIPBOARD);
   match.destination_url = url;
-  match.contents.assign(AutocompleteMatch::FormatUrlForSuggestionDisplay(
-      url, true /* trim_scheme */, nullptr));
+  auto format_types = AutocompleteMatch::GetFormatTypes(true);
+  match.contents.assign(url_formatter::FormatUrl(
+      url, format_types, net::UnescapeRule::SPACES, nullptr, nullptr, nullptr));
   AutocompleteMatch::ClassifyLocationInString(
       base::string16::npos, 0, match.contents.length(),
       ACMatchClassification::URL, &match.contents_class);
 
   match.description.assign(l10n_util::GetStringUTF16(IDS_LINK_FROM_CLIPBOARD));
   AutocompleteMatch::ClassifyLocationInString(
       base::string16::npos, 0, match.description.length(),
       ACMatchClassification::NONE, &match.description_class);
 
   matches_.push_back(match);
 }
 
 void ClipboardURLProvider::AddProviderInfo(ProvidersInfo* provider_info) const {
   // If a URL wasn't suggested on this most recent focus event, don't bother
   // setting |times_returned_results_in_session|, as in effect this URL has
   // never been suggested during the current session.  (For the purpose of
   // this provider, we define a session as intervals between when a URL
   // clipboard suggestion changes.)
   if (current_url_suggested_times_ == 0)
     return;
   provider_info->push_back(metrics::OmniboxEventProto_ProviderInfo());
   metrics::OmniboxEventProto_ProviderInfo& new_entry = provider_info->back();
   new_entry.set_provider(AsOmniboxEventProviderType());
   new_entry.set_times_returned_results_in_session(current_url_suggested_times_);
 }