Omnibox UI Experiments: Refactor HTTPS trimming into UrlFormatter.

components/omnibox/browser/autocomplete_match.h

Index: components/omnibox/browser/autocomplete_match.h
diff --git a/components/omnibox/browser/autocomplete_match.h b/components/omnibox/browser/autocomplete_match.h
index b8659cd7bb04919e3838ed14eb2a891222374afe..e238ccc6f3842550176ebab8c0b14add06764cae 100644
--- a/components/omnibox/browser/autocomplete_match.h
+++ b/components/omnibox/browser/autocomplete_match.h
@@ -16,6 +16,7 @@
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match_type.h"
 #include "components/search_engines/template_url.h"
+#include "components/url_formatter/url_formatter.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
@@ -208,23 +209,11 @@ struct AutocompleteMatch {
                                  TemplateURLService* template_url_service,
                                  const base::string16& keyword);
 
-  // These are convenience functions for formatting a URL into an abridged form
-  // for display within the Omnibox suggestions dropdown.
-  //
-  // The results are explicitly for non-security surfaces. Do not use the
-  // results for anything other than the Omnibox dropdown.
-  static base::string16 FormatUrlForSuggestionDisplay(
-      const GURL& url,
-      bool trim_scheme,
-      size_t* offset_for_adjustment);
-  static base::string16 FormatUrlForSuggestionDisplayWithOffsets(
-      const GURL& url,
-      bool trim_scheme,
-      std::vector<size_t>* offsets_for_adjustment);
-  static base::string16 FormatUrlForSuggestionDisplayWithAdjustments(
-      const GURL& url,
-      bool trim_scheme,
-      base::OffsetAdjuster::Adjustments* adjustments);
+  // Gets the formatting flags used for display of suggestions. This method
+  // encapsulates the return of experimental flags too, so any URLs displayed
+  // as an Omnibox suggestion should use this method.
+  static url_formatter::FormatUrlTypes GetFormatForSuggestionDisplay(

[Peter Kasting, 2017/06/29 01:05:44]

Nit: GetFormatTypesForSuggestionDisplay()?

Or maybe this should be GetFormatTypesForDisplay() or even just
GetFormatTypes()?  "Suggestion" isn't used much in the omnibox code and I don't
really know what it means, but this function does seem relevant to anywhere
we're formatting an AutocompleteMatch for display.

[tommycli, 2017/06/29 16:46:46]

Done. GetFormatTypes -- love the brevity. Indeed it being a static function of
AutocompleteMatch should already explain that it's for autocomplete matches.

+      bool trim_scheme);
 
   // Computes the stripped destination URL (via GURLToStrippedGURL()) and
   // stores the result in |stripped_destination_url|.  |input| is used for the