Omnibox: Make URLs of Bookmarks Searchable

chrome/browser/autocomplete/shortcuts_provider.cc

Index: chrome/browser/autocomplete/shortcuts_provider.cc
diff --git a/chrome/browser/autocomplete/shortcuts_provider.cc b/chrome/browser/autocomplete/shortcuts_provider.cc
index 6969b9b6fe9754db0ad9d284dfed5bab4c7a12b7..5d543bc7846fd675c26c646485e12941621309d1 100644
--- a/chrome/browser/autocomplete/shortcuts_provider.cc
+++ b/chrome/browser/autocomplete/shortcuts_provider.cc
@@ -216,11 +216,11 @@ AutocompleteMatch ShortcutsProvider::ShortcutToACMatch(
   // If the match is a search query this is easy: simply check whether the
   // user text is a prefix of the query.  If the match is a navigation, we
   // assume the fill_into_edit looks something like a URL, so we use
-  // URLPrefix::ComputeMatchStartAndInlineAutocompleteOffset() to try and strip
-  // off any prefixes that the user might not think would change the meaning,
-  // but would otherwise prevent inline autocompletion.  This allows, for
-  // example, the input of "foo.c" to autocomplete to "foo.com" for a
-  // fill_into_edit of "http://foo.com".
+  // URLPrefix::GetInlineAutocompleteOffset() to try and strip off any prefixes
+  // that the user might not think would change the meaning, but would
+  // otherwise prevent inline autocompletion.  This allows, for example, the
+  // input of "foo.c" to autocomplete to "foo.com" for a fill_into_edit of
+  // "http://foo.com".
   if (AutocompleteMatch::IsSearchType(match.type)) {
     if (StartsWith(match.fill_into_edit, input.text(), false)) {
       match.inline_autocompletion =
@@ -230,10 +230,9 @@ AutocompleteMatch ShortcutsProvider::ShortcutToACMatch(
           match.inline_autocompletion.empty();
     }
   } else {
-    size_t match_start, inline_autocomplete_offset;
-    URLPrefix::ComputeMatchStartAndInlineAutocompleteOffset(
-        input, fixed_up_input, true, match.fill_into_edit,
-        &match_start, &inline_autocomplete_offset);
+    const size_t inline_autocomplete_offset =
+        URLPrefix::GetInlineAutocompleteOffset(
+            input, fixed_up_input, true, match.fill_into_edit);
     if (inline_autocomplete_offset != base::string16::npos) {
       match.inline_autocompletion =
           match.fill_into_edit.substr(inline_autocomplete_offset);