Rename BookmarkIndex to TitledUrlIndex and BookmarkMatch to TitledUrlMatch

components/bookmarks/browser/bookmark_match.h

Index: components/bookmarks/browser/bookmark_match.h
diff --git a/components/bookmarks/browser/bookmark_match.h b/components/bookmarks/browser/bookmark_match.h
deleted file mode 100644
index 76cb0bfae6b1a84b4f4d1588fc4dd460873b3cbf..0000000000000000000000000000000000000000
--- a/components/bookmarks/browser/bookmark_match.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// 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_MATCH_H_
-#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MATCH_H_
-
-#include <stddef.h>
-
-#include <cstddef>
-#include <utility>
-#include <vector>
-
-namespace bookmarks {
-
-class TitledUrlNode;
-
-struct BookmarkMatch {
-  // Each MatchPosition is the [begin, end) positions of a match within a
-  // string.
-  using MatchPosition = std::pair<size_t, size_t>;
-  using MatchPositions = std::vector<MatchPosition>;
-
-  BookmarkMatch();
-  BookmarkMatch(const BookmarkMatch& other);
-  ~BookmarkMatch();
-
-  // Extracts and returns the offsets from |match_positions|.
-  static std::vector<size_t> OffsetsFromMatchPositions(
-      const MatchPositions& match_positions);
-
-  // Replaces the offsets in |match_positions| with those given in |offsets|,
-  // deleting any which are npos, and returns the updated list of match
-  // positions.
-  static MatchPositions ReplaceOffsetsInMatchPositions(
-      const MatchPositions& match_positions,
-      const std::vector<size_t>& offsets);
-
-  // The matching node of a query.
-  const TitledUrlNode* node;
-
-  // Location of the matching words in the title of the node.
-  MatchPositions title_match_positions;
-
-  // Location of the matching words in the URL of the node.
-  MatchPositions url_match_positions;
-};
-
-}  // namespace bookmarks
-
-#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MATCH_H_