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

components/omnibox/bookmark_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/bookmark_provider.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
@@ skipping 188 matching lines @@
   match.contents_class =
       ClassificationsFromMatch(new_url_match_positions,
                                match.contents.size(),
                                true);
   match.fill_into_edit =
       AutocompleteInput::FormattedStringWithEquivalentMeaning(
           url, match.contents, client_->GetSchemeClassifier());
   if (inline_autocomplete_offset != base::string16::npos) {
     // |inline_autocomplete_offset| may be beyond the end of the
     // |fill_into_edit| if the user has typed an URL with a scheme and the
-    // last character typed is a slash.  That slash is removed by the
+    // last character typed is a slash.  That slash may be removed by the
     // FormatURLWithOffsets call above.
     if (inline_autocomplete_offset < match.fill_into_edit.length()) {

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

Nit: Other than the builtin provider, every other place you touch does something
equivalent to this (sometimes stricter by DCHECKing that non-npos offsets are
always < fill_into_edit.length()).

Perhaps it makes sense to create some sort of helper on AutocompleteMatch like
SetURLAutocompletion(offset) that is basically this conditional block, then just
call that everywhere.  We'd lose the strictness of those DCHECKs, which seems
OK.

       match.inline_autocompletion =
           match.fill_into_edit.substr(inline_autocomplete_offset);
+      match.StripLoneSlashOnInlineAutocompletion();
     }
     match.allowed_to_be_default_match = match.inline_autocompletion.empty() ||
         !HistoryProvider::PreventInlineAutocomplete(input);
   }
   match.description = title;
   match.description_class =
       ClassificationsFromMatch(bookmark_match.title_match_positions,
                                match.description.size(),
                                false);
 
@@ skipping 111 matching lines @@
        i != positions.end();
        ++i) {
     AutocompleteMatch::ACMatchClassifications new_class;
     AutocompleteMatch::ClassifyLocationInString(i->first, i->second - i->first,
         text_length, url_style, &new_class);
     classifications = AutocompleteMatch::MergeClassifications(
         classifications, new_class);
   }
   return classifications;
 }