Remove the BookmarkService interface

chrome/browser/importer/profile_writer_unittest.cc

Index: chrome/browser/importer/profile_writer_unittest.cc
diff --git a/chrome/browser/importer/profile_writer_unittest.cc b/chrome/browser/importer/profile_writer_unittest.cc
index 48b015a6fda2382bca9d16b093178b21791f606c..724721dfa22a1bdd08fceb034b223d3915949963 100644
--- a/chrome/browser/importer/profile_writer_unittest.cc
+++ b/chrome/browser/importer/profile_writer_unittest.cc
@@ -77,7 +77,7 @@ class ProfileWriterTest : public testing::Test {
   }
 
   void VerifyBookmarksCount(
-      const std::vector<BookmarkService::URLAndTitle>& bookmarks_record,
+      const std::vector<BookmarkModel::URLAndTitle>& bookmarks_record,
       BookmarkModel* bookmark_model,
       size_t expected) {
     std::vector<BookmarkMatch> matches;
@@ -158,11 +158,11 @@ TEST_F(ProfileWriterTest, CheckBookmarksWithMultiProfile) {
   profile_writer->AddBookmarks(bookmarks_,
                                base::ASCIIToUTF16("Imported from Firefox"));
 
-  std::vector<BookmarkService::URLAndTitle> url_record1;
+  std::vector<BookmarkModel::URLAndTitle> url_record1;
   bookmark_model1->GetBookmarks(&url_record1);
   EXPECT_EQ(2u, url_record1.size());
 
-  std::vector<BookmarkService::URLAndTitle> url_record2;
+  std::vector<BookmarkModel::URLAndTitle> url_record2;
   bookmark_model2->GetBookmarks(&url_record2);
   EXPECT_EQ(1u, url_record2.size());
 }
@@ -181,7 +181,7 @@ TEST_F(ProfileWriterTest, CheckBookmarksAfterWritingDataTwice) {
       new TestProfileWriter(&profile));
   profile_writer->AddBookmarks(bookmarks_,
                                base::ASCIIToUTF16("Imported from Firefox"));
-  std::vector<BookmarkService::URLAndTitle> bookmarks_record;
+  std::vector<BookmarkModel::URLAndTitle> bookmarks_record;
   bookmark_model->GetBookmarks(&bookmarks_record);
   EXPECT_EQ(2u, bookmarks_record.size());