Rename BookmarkIndex to TitledUrlIndex and BookmarkMatch to TitledUrlMatch

components/omnibox/browser/bookmark_provider.h

 // 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.
 
 #ifndef COMPONENTS_OMNIBOX_BROWSER_BOOKMARK_PROVIDER_H_
 #define COMPONENTS_OMNIBOX_BROWSER_BOOKMARK_PROVIDER_H_
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/query_parser/snippet.h"
 
 class AutocompleteProviderClient;
 
 namespace bookmarks {
 class BookmarkModel;
-struct BookmarkMatch;
+struct TitledUrlMatch;
 }
 
 // This class is an autocomplete provider which quickly (and synchronously)
 // provides autocomplete suggestions based on the titles of bookmarks. Page
 // titles, URLs, and typed and visit counts of the bookmarks are not currently
 // taken into consideration as those factors will have been used by the
 // HistoryQuickProvider (HQP) while identifying suggestions.
 //
 // TODO(mrossetti): Propose a way to coordinate with the HQP the taking of typed
 // and visit counts and last visit dates, etc. into consideration while scoring.
@@ skipping 19 matching lines @@
 
   // Performs the actual matching of |input| over the bookmarks and fills in
   // |matches_|.
   void DoAutocomplete(const AutocompleteInput& input);
 
   // Compose an AutocompleteMatch based on |match| that has 1) the URL of
   // |match|'s bookmark, and 2) the bookmark's title, not the URL's page
   // title, as the description.  |input| is used to compute the match's
   // inline_autocompletion.  |fixed_up_input_text| is used in that way as well;
   // it's passed separately so this function doesn't have to compute it.
-  AutocompleteMatch BookmarkMatchToACMatch(
+  AutocompleteMatch TitledUrlMatchToACMatch(
       const AutocompleteInput& input,
       const base::string16& fixed_up_input_text,
-      const bookmarks::BookmarkMatch& match);
+      const bookmarks::TitledUrlMatch& match);
 
   // Converts |positions| into ACMatchClassifications and returns the
   // classifications. |text_length| is used to determine the need to add an
   // 'unhighlighted' classification span so the tail of the source string
   // properly highlighted.
   static ACMatchClassifications ClassificationsFromMatch(
       const query_parser::Snippet::MatchPositions& positions,
       size_t text_length,
       bool is_url);
 
   AutocompleteProviderClient* client_;
   bookmarks::BookmarkModel* bookmark_model_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkProvider);
 };
 
 #endif  // COMPONENTS_OMNIBOX_BROWSER_BOOKMARK_PROVIDER_H_