Rename BookmarkIndex to TitledUrlIndex and BookmarkMatch to TitledUrlMatch

components/omnibox/browser/bookmark_provider_unittest.cc

Index: components/omnibox/browser/bookmark_provider_unittest.cc
diff --git a/components/omnibox/browser/bookmark_provider_unittest.cc b/components/omnibox/browser/bookmark_provider_unittest.cc
index c962ad34083b1655f068f1a51cfa0aa9f1270dfd..277f3c38beb927679b2c440529a0188d16e9e61b 100644
--- a/components/omnibox/browser/bookmark_provider_unittest.cc
+++ b/components/omnibox/browser/bookmark_provider_unittest.cc
@@ -18,8 +18,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/bookmarks/browser/bookmark_match.h"
 #include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/browser/titled_url_match.h"
 #include "components/bookmarks/test/test_bookmark_client.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
@@ -28,9 +28,9 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using bookmarks::BookmarkMatch;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
+using bookmarks::TitledUrlMatch;
 
 namespace {
 
@@ -420,9 +420,9 @@ TEST_F(BookmarkProviderTest, InlineAutocompletion) {
         provider_->FixupUserInput(input).second);
     BookmarkNode node(GURL(query_data[i].url));
     node.SetTitle(base::ASCIIToUTF16(query_data[i].url));
-    BookmarkMatch bookmark_match;
+    TitledUrlMatch bookmark_match;
     bookmark_match.node = &node;
-    const AutocompleteMatch& ac_match = provider_->BookmarkMatchToACMatch(
+    const AutocompleteMatch& ac_match = provider_->TitledUrlMatchToACMatch(
         input, fixed_up_input, bookmark_match);
     EXPECT_EQ(query_data[i].allowed_to_be_default_match,
               ac_match.allowed_to_be_default_match) << description;