Reland - Omnibox - Mark As Duplicates URLs that only differ by a trailing slash

components/omnibox/history_url_provider.cc

 // Copyright (c) 2012 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/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 1158 matching lines @@
       std::string() : params.languages;
   const net::FormatUrlTypes format_types = net::kFormatUrlOmitAll &
       ~((params.trim_http && !history_match.match_in_scheme) ?
           0 : net::kFormatUrlOmitHTTP);
   match.fill_into_edit =
       AutocompleteInput::FormattedStringWithEquivalentMeaning(
           info.url(), net::FormatUrl(info.url(), languages, format_types,
                                      net::UnescapeRule::SPACES, NULL, NULL,
                                      &inline_autocomplete_offset),
           client()->GetSchemeClassifier());
-  if (!params.prevent_inline_autocomplete &&

[Peter Kasting, 2015/07/01 22:01:36]

What makes this safe to remove?

-      (inline_autocomplete_offset != base::string16::npos)) {
+  if (inline_autocomplete_offset != base::string16::npos) {
     DCHECK(inline_autocomplete_offset <= match.fill_into_edit.length());
     match.inline_autocompletion =
         match.fill_into_edit.substr(inline_autocomplete_offset);
+    match.StripLoneSlashOnInlineAutocompletion();
   }
-  // The latter part of the test effectively asks "is the inline completion
-  // empty?" (i.e., is this match effectively the what-you-typed match?).
   match.allowed_to_be_default_match = !params.prevent_inline_autocomplete ||
       ((inline_autocomplete_offset != base::string16::npos) &&
-       (inline_autocomplete_offset >= match.fill_into_edit.length()));
+       match.inline_autocompletion.empty());
 
   size_t match_start = history_match.input_location;
   match.contents = net::FormatUrl(info.url(), languages,
       format_types, net::UnescapeRule::SPACES, NULL, NULL, &match_start);
   if ((match_start != base::string16::npos) &&
       (inline_autocomplete_offset != base::string16::npos) &&
       (inline_autocomplete_offset != match_start)) {
     DCHECK(inline_autocomplete_offset > match_start);
     AutocompleteMatch::ClassifyLocationInString(match_start,
         inline_autocomplete_offset - match_start, match.contents.length(),
         ACMatchClassification::URL, &match.contents_class);
   } else {
     AutocompleteMatch::ClassifyLocationInString(base::string16::npos, 0,
         match.contents.length(), ACMatchClassification::URL,
         &match.contents_class);
   }
   match.description = info.title();
   match.description_class =
       ClassifyDescription(params.input.text(), match.description);
   RecordAdditionalInfoFromUrlRow(info, &match);
   return match;
 }