Omnibox UI Experiments: Implement scheme-trimming for suggested URLs.

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 = url_formatter::FormatUrlWithOffsets(
-      url, url_formatter::kFormatUrlOmitAll &
-               ~(trim_http ? 0 : url_formatter::kFormatUrlOmitHTTP),
-      net::UnescapeRule::SPACES, nullptr, nullptr, &offsets);
+  base::OffsetAdjuster::Adjustments adjustments;
+  match.contents =
+      AutocompleteMatch::FormatUrlForSuggestionDisplayWithAdjustments(

[Justin Donnelly, 2017/06/20 17:31:02]

If it's worth having a convenience version of this function that accepts a
single offset, it's probably worth having one that takes a vector of offsets,
too.

[tommycli, 2017/06/20 22:51:21]

Done. Hmm... well after this there's now some non-trivial code duplication
between the the convenience methods for Offsets in autocomplete_match.cc and
url_formatter.cc. Take a look.

Folding the logic into the URLFormatter method is starting to look more
appealing, but still not very appealing given all the downsides we discussed
earlier today.

Let me know your thoughts. -- if we should send this in for now or rethink
things now.

+          url, trim_http, &adjustments);
+  base::OffsetAdjuster::AdjustOffsets(adjustments, &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