Omnibox UI Experiments: Refactor HTTPS trimming into UrlFormatter.

components/omnibox/browser/autocomplete_match.cc

 // 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.
 
 #include "components/omnibox/browser/autocomplete_match.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/feature_list.h"
@@ skipping 471 matching lines @@
     needs_replacement = true;
   }
 
   if (needs_replacement)
     stripped_destination_url = stripped_destination_url.ReplaceComponents(
         replacements);
   return stripped_destination_url;
 }
 
 // static
 base::string16 AutocompleteMatch::FormatUrlForSuggestionDisplay(

[Peter Kasting, 2017/06/28 23:09:59]

I think we should nuke all these functions now.  Instead, just provide a simple
accessor somewhere to get the right format types; then all the places calling
these can call the real underlying FormatURL functions and not duplicate the
"compute the format types" logic.

[tommycli, 2017/06/29 00:19:43]

Done.

     const GURL& url,
     bool trim_scheme,
     size_t* offset_for_adjustment) {
   std::vector<size_t> offsets;
   if (offset_for_adjustment)
     offsets.push_back(*offset_for_adjustment);
   base::string16 result =
       FormatUrlForSuggestionDisplayWithOffsets(url, trim_scheme, &offsets);
   if (offset_for_adjustment)
     *offset_for_adjustment = offsets[0];
@@ skipping 16 matching lines @@
         base::LimitOffset<std::string>(format_url_return_value.length()));
   }
   return format_url_return_value;
 }
 
 // static
 base::string16 AutocompleteMatch::FormatUrlForSuggestionDisplayWithAdjustments(
     const GURL& url,
     bool trim_scheme,
     base::OffsetAdjuster::Adjustments* adjustments) {
-  const url_formatter::FormatUrlTypes format_types =
-      url_formatter::kFormatUrlOmitAll &
-      ~(trim_scheme ? 0 : url_formatter::kFormatUrlOmitHTTP);
-  base::string16 result = url_formatter::FormatUrlWithAdjustments(
-      url, format_types, net::UnescapeRule::SPACES, nullptr, nullptr,
-      adjustments);
-
-  // Also trim HTTPS if experiment is enabled. Note this intentionally has
-  // no effect on view-source URLs.
-  if (trim_scheme && base::FeatureList::IsEnabled(
-                         omnibox::kUIExperimentHideSuggestionUrlScheme)) {
-    // TODO(tommycli): If this becomes enabled by default, investigate
-    // folding this logic into url_formatter::FormatUrlWithAdjustments.
-    if (url.SchemeIs(url::kHttpsScheme)) {
-      const size_t kHTTPSSize =
-          strlen(url::kHttpsScheme) + strlen(url::kStandardSchemeSeparator);
-      result = result.substr(kHTTPSSize);
-      adjustments->insert(adjustments->begin(),
-                          base::OffsetAdjuster::Adjustment(0, kHTTPSSize, 0));
-    }
+  auto format_types = url_formatter::kFormatUrlOmitAll;
+  if (!trim_scheme) {
+    format_types &= ~url_formatter::kFormatUrlOmitHTTP;
+  } else if (base::FeatureList::IsEnabled(
+                 omnibox::kUIExperimentHideSuggestionUrlScheme)) {
+    format_types |= url_formatter::kFormatUrlExperimentalOmitHTTPS;
   }
 
-  return result;
+  return url_formatter::FormatUrlWithAdjustments(url, format_types,
+                                                 net::UnescapeRule::SPACES,
+                                                 nullptr, nullptr, adjustments);
 }
 
 void AutocompleteMatch::ComputeStrippedDestinationURL(
     const AutocompleteInput& input,
     TemplateURLService* template_url_service) {
   stripped_destination_url = GURLToStrippedGURL(
       destination_url, input, template_url_service, keyword);
 }
 
 void AutocompleteMatch::EnsureUWYTIsAllowedToBeDefault(
@@ skipping 127 matching lines @@
         << " is unsorted in relation to last offset of " << last_offset
         << ". Provider: " << provider_name << ".";
     DCHECK_LT(i->offset, text.length())
         << " Classification of [" << i->offset << "," << text.length()
         << "] is out of bounds for \"" << text << "\". Provider: "
         << provider_name << ".";
     last_offset = i->offset;
   }
 }
 #endif