Omnibox: Make URLs of Bookmarks Searchable

chrome/browser/importer/profile_writer_unittest.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/importer/profile_writer.h"
 
 #include <string>
 
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_test_helpers.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_unittest_utils.h"
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/bookmarks/core/browser/bookmark_title_match.h"
+#include "components/bookmarks/core/browser/bookmark_match.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 class TestProfileWriter : public ProfileWriter {
  public:
   explicit TestProfileWriter(Profile* profile) : ProfileWriter(profile) {}
  protected:
   virtual ~TestProfileWriter() {}
@@ skipping 41 matching lines @@
         MakeURLRow("http://www.yahoo.com", base::ASCIIToUTF16("Yahoo"),
         3, 30, 10));
     pages_.push_back(row1);
     pages_.push_back(row2);
   }
 
   void VerifyBookmarksCount(
       const std::vector<BookmarkService::URLAndTitle>& bookmarks_record,
       BookmarkModel* bookmark_model,
       size_t expected) {
-    std::vector<BookmarkTitleMatch> matches;
+    std::vector<BookmarkMatch> matches;
     for (size_t i = 0; i < bookmarks_record.size(); ++i) {
-      bookmark_model->GetBookmarksWithTitlesMatching(bookmarks_record[i].title,
-                                                     10,
-                                                     &matches);
+      bookmark_model->GetBookmarksMatching(
+          bookmarks_record[i].title, 10, &matches);
       EXPECT_EQ(expected, matches.size());
       matches.clear();
     }
   }
 
   void VerifyHistoryCount(Profile* profile) {
     HistoryService* history_service =
         HistoryServiceFactory::GetForProfile(profile,
                                              Profile::EXPLICIT_ACCESS);
     history::QueryOptions options;
@@ skipping 107 matching lines @@
       new TestProfileWriter(&profile));
   profile_writer->AddHistoryPage(pages_, history::SOURCE_FIREFOX_IMPORTED);
   VerifyHistoryCount(&profile);
   size_t original_history_count = history_count_;
   history_count_ = 0;
 
   profile_writer->AddHistoryPage(pages_, history::SOURCE_FIREFOX_IMPORTED);
   VerifyHistoryCount(&profile);
   EXPECT_EQ(original_history_count, history_count_);
 }