Omnibox UI Experiments: Refactor HTTPS trimming into UrlFormatter.

components/omnibox/browser/autocomplete_match.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_H_
 #define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_H_
 
 #include <stddef.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/strings/utf_offset_string_conversions.h"
 #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"
 
 class AutocompleteProvider;
 class SuggestionAnswer;
 class TemplateURL;
 class TemplateURLService;
 
 namespace base {
 class Time;
@@ skipping 172 matching lines @@
   // be altered during stripping.  If this URL, minus the scheme and separator,
   // starts with any the terms in input.terms_prefixed_by_http_or_https(), we
   // avoid converting an HTTPS scheme to HTTP.  This means URLs that differ
   // only by these schemes won't be marked as dupes, since the distinction
   // seems to matter to the user.
   static GURL GURLToStrippedGURL(const GURL& url,
                                  const AutocompleteInput& input,
                                  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
   // same purpose as in GURLToStrippedGURL().
   void ComputeStrippedDestinationURL(const AutocompleteInput& input,
                                      TemplateURLService* template_url_service);
 
   // Sets |allowed_to_be_default_match| to true if this match is effectively
   // the URL-what-you-typed match (i.e., would be dupped against the UWYT
   // match when AutocompleteResult merges matches).
@@ skipping 206 matching lines @@
       const base::string16& text,
       const ACMatchClassifications& classifications) const;
 #endif
 };
 
 typedef AutocompleteMatch::ACMatchClassification ACMatchClassification;
 typedef std::vector<ACMatchClassification> ACMatchClassifications;
 typedef std::vector<AutocompleteMatch> ACMatches;
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_H_