base::OffsetAdjuster: Refactor offset limiting logic into the base::OffsetAdjuster

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 475 matching lines @@
     stripped_destination_url = stripped_destination_url.ReplaceComponents(
         replacements);
   return stripped_destination_url;
 }
 
 // static
 base::string16 AutocompleteMatch::FormatUrlForSuggestionDisplay(
     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];
+  base::OffsetAdjuster::Adjustments adjustments;
+  base::string16 result = FormatUrlForSuggestionDisplayWithAdjustments(
+      url, trim_scheme, &adjustments);
+  if (offset_for_adjustment) {
+    base::OffsetAdjuster::AdjustOffset(adjustments, offset_for_adjustment,
+                                       result.length());
+  }
   return result;
 }
 
 // static
-base::string16 AutocompleteMatch::FormatUrlForSuggestionDisplayWithOffsets(

[Justin Donnelly, 2017/06/27 15:28:45]

I think we should keep this function. If it makes sense to adjust the offsets on
behalf of the caller in FormatUrlForSuggestionDisplay, it makes as much sense to
do so here.

[tommycli, 2017/07/07 19:27:10]

Acknowledged.

-    const GURL& url,
-    bool trim_scheme,
-    std::vector<size_t>* offsets_for_adjustment) {
-  base::OffsetAdjuster::Adjustments adjustments;
-  const base::string16& format_url_return_value =
-      FormatUrlForSuggestionDisplayWithAdjustments(url, trim_scheme,
-                                                   &adjustments);
-  base::OffsetAdjuster::AdjustOffsets(adjustments, offsets_for_adjustment);
-  if (offsets_for_adjustment) {
-    std::for_each(
-        offsets_for_adjustment->begin(), offsets_for_adjustment->end(),
-        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);
@@ skipping 154 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