Rename BookmarkIndex to TitledUrlIndex and BookmarkMatch to TitledUrlMatch

components/bookmarks/browser/bookmark_model.h

 // 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.
 
 #ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 28 matching lines @@
 }
 
 namespace query_parser {
 enum class MatchingAlgorithm;
 }
 
 namespace bookmarks {
 
 class BookmarkCodecTest;
 class BookmarkExpandedStateTracker;
-class BookmarkIndex;
 class BookmarkLoadDetails;
 class BookmarkModelObserver;
 class BookmarkStorage;
 class BookmarkUndoDelegate;
 class ScopedGroupBookmarkActions;
 class TestBookmarkClient;
-struct BookmarkMatch;
+class TitledUrlIndex;
+struct TitledUrlMatch;
 
 // BookmarkModel --------------------------------------------------------------
 
 // BookmarkModel provides a directed acyclic graph of URLs and folders.
 // Three graphs are provided for the three entry points: those on the 'bookmarks
 // bar', those in the 'other bookmarks' folder and those in the 'mobile' folder.
 //
 // An observer may be attached to observe relevant events.
 //
 // You should NOT directly create a BookmarkModel, instead go through the
@@ skipping 169 matching lines @@
 
   // Resets the 'date modified' time of the node to 0. This is used during
   // importing to exclude the newly created folders from showing up in the
   // combobox of most recently modified folders.
   void ResetDateFolderModified(const BookmarkNode* node);
 
   // Returns up to |max_count| of bookmarks containing each term from |text|
   // in either the title or the URL. It uses default matching algorithm.
   void GetBookmarksMatching(const base::string16& text,
                             size_t max_count,
-                            std::vector<BookmarkMatch>* matches);
+                            std::vector<TitledUrlMatch>* matches);
 
   // Returns up to |max_count| of bookmarks containing each term from |text|
   // in either the title or the URL.
   void GetBookmarksMatching(const base::string16& text,
                             size_t max_count,
                             query_parser::MatchingAlgorithm matching_algorithm,
-                            std::vector<BookmarkMatch>* matches);
+                            std::vector<TitledUrlMatch>* matches);
 
   // Sets the store to NULL, making it so the BookmarkModel does not persist
   // any changes to disk. This is only useful during testing to speed up
   // testing.
   void ClearStore();
 
   // Returns the next node ID.
   int64_t next_node_id() const { return next_node_id_; }
 
   // Returns the object responsible for tracking the set of expanded nodes in
@@ skipping 179 matching lines @@
   typedef std::multiset<BookmarkNode*, NodeURLComparator> NodesOrderedByURLSet;
   NodesOrderedByURLSet nodes_ordered_by_url_set_;
   base::Lock url_lock_;
 
   // Used for loading favicons.
   base::CancelableTaskTracker cancelable_task_tracker_;
 
   // Reads/writes bookmarks to disk.
   std::unique_ptr<BookmarkStorage> store_;
 
-  std::unique_ptr<BookmarkIndex> index_;
+  std::unique_ptr<TitledUrlIndex> index_;
 
   base::WaitableEvent loaded_signal_;
 
   // See description of IsDoingExtensiveChanges above.
   int extensive_changes_;
 
   std::unique_ptr<BookmarkExpandedStateTracker> expanded_state_tracker_;
 
   std::set<std::string> non_cloned_keys_;
 
   BookmarkUndoDelegate* undo_delegate_;
   std::unique_ptr<BookmarkUndoDelegate> empty_undo_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 }  // namespace bookmarks
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_