Rename BookmarkIndex to TitledUrlIndex and BookmarkMatch to TitledUrlMatch

components/bookmarks/browser/bookmark_storage.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_STORAGE_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_STORAGE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/files/important_file_writer.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "components/bookmarks/browser/bookmark_index.h"
 #include "components/bookmarks/browser/bookmark_node.h"
+#include "components/bookmarks/browser/titled_url_index.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace bookmarks {
 
 class BookmarkModel;
 
 // A list of BookmarkPermanentNodes that owns them.
@@ skipping 12 matching lines @@
 // the main thread) when loading is done, passing ownership back to the
 // BookmarkModel. While loading BookmarkModel does not maintain references to
 // the contents of the BookmarkLoadDetails, this ensures we don't have any
 // threading problems.
 class BookmarkLoadDetails {
  public:
   BookmarkLoadDetails(BookmarkPermanentNode* bb_node,
                       BookmarkPermanentNode* other_folder_node,
                       BookmarkPermanentNode* mobile_folder_node,
                       const LoadExtraCallback& load_extra_callback,
-                      BookmarkIndex* index,
+                      TitledUrlIndex* index,
                       int64_t max_id);
   ~BookmarkLoadDetails();
 
   void LoadExtraNodes();
 
   BookmarkPermanentNode* bb_node() { return bb_node_.get(); }
   std::unique_ptr<BookmarkPermanentNode> owned_bb_node() {
     return std::move(bb_node_);
   }
   BookmarkPermanentNode* mobile_folder_node() {
     return mobile_folder_node_.get();
   }
   std::unique_ptr<BookmarkPermanentNode> owned_mobile_folder_node() {
     return std::move(mobile_folder_node_);
   }
   BookmarkPermanentNode* other_folder_node() {
     return other_folder_node_.get();
   }
   std::unique_ptr<BookmarkPermanentNode> owned_other_folder_node() {
     return std::move(other_folder_node_);
   }
   const BookmarkPermanentNodeList& extra_nodes() {
     return extra_nodes_;
   }
   BookmarkPermanentNodeList owned_extra_nodes() {
     return std::move(extra_nodes_);
   }
-  BookmarkIndex* index() { return index_.get(); }
-  std::unique_ptr<BookmarkIndex> owned_index() { return std::move(index_); }
+  TitledUrlIndex* index() { return index_.get(); }
+  std::unique_ptr<TitledUrlIndex> owned_index() { return std::move(index_); }
 
   const BookmarkNode::MetaInfoMap& model_meta_info_map() const {
     return model_meta_info_map_;
   }
   void set_model_meta_info_map(const BookmarkNode::MetaInfoMap& meta_info_map) {
     model_meta_info_map_ = meta_info_map;
   }
 
   int64_t model_sync_transaction_version() const {
     return model_sync_transaction_version_;
@@ skipping 24 matching lines @@
   // reassign the ids to ensure they are unique.
   void set_ids_reassigned(bool value) { ids_reassigned_ = value; }
   bool ids_reassigned() const { return ids_reassigned_; }
 
  private:
   std::unique_ptr<BookmarkPermanentNode> bb_node_;
   std::unique_ptr<BookmarkPermanentNode> other_folder_node_;
   std::unique_ptr<BookmarkPermanentNode> mobile_folder_node_;
   LoadExtraCallback load_extra_callback_;
   BookmarkPermanentNodeList extra_nodes_;
-  std::unique_ptr<BookmarkIndex> index_;
+  std::unique_ptr<TitledUrlIndex> index_;
   BookmarkNode::MetaInfoMap model_meta_info_map_;
   int64_t model_sync_transaction_version_;
   int64_t max_id_;
   std::string computed_checksum_;
   std::string stored_checksum_;
   bool ids_reassigned_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkLoadDetails);
 };
 
@@ skipping 67 matching lines @@
   scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner_;
 
   base::WeakPtrFactory<BookmarkStorage> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkStorage);
 };
 
 }  // namespace bookmarks
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_STORAGE_H_