Remove the BookmarkService interface

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"
@@ skipping 59 matching lines @@
         MakeURLRow("http://www.google.com", base::ASCIIToUTF16("Google"),
         3, 10, 1));
     history::URLRow row2(
         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,
+      const std::vector<BookmarkModel::URLAndTitle>& bookmarks_record,
       BookmarkModel* bookmark_model,
       size_t expected) {
     std::vector<BookmarkMatch> matches;
     for (size_t i = 0; i < bookmarks_record.size(); ++i) {
       bookmark_model->GetBookmarksMatching(
           bookmarks_record[i].title, 10, &matches);
       EXPECT_EQ(expected, matches.size());
       matches.clear();
     }
   }
@@ skipping 60 matching lines @@
   CreateImportedBookmarksEntries();
   BookmarkModel* bookmark_model1 =
       BookmarkModelFactory::GetForProfile(&profile1);
   test::WaitForBookmarkModelToLoad(bookmark_model1);
 
   scoped_refptr<TestProfileWriter> profile_writer(
       new TestProfileWriter(&profile1));
   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());
 }
 
 // Verify that bookmarks are duplicated when added twice.
 TEST_F(ProfileWriterTest, CheckBookmarksAfterWritingDataTwice) {
   TestingProfile profile;
   profile.CreateBookmarkModel(true);
 
   CreateImportedBookmarksEntries();
   BookmarkModel* bookmark_model =
       BookmarkModelFactory::GetForProfile(&profile);
   test::WaitForBookmarkModelToLoad(bookmark_model);
 
   scoped_refptr<TestProfileWriter> profile_writer(
       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());
 
   VerifyBookmarksCount(bookmarks_record, bookmark_model, 1);
 
   profile_writer->AddBookmarks(bookmarks_,
                                base::ASCIIToUTF16("Imported from Firefox"));
   // Verify that duplicate bookmarks exist.
   VerifyBookmarksCount(bookmarks_record, bookmark_model, 2);
 }
 
 // Verify that history entires are not duplicated when added twice.
 TEST_F(ProfileWriterTest, CheckHistoryAfterWritingDataTwice) {
   TestingProfile profile;
   ASSERT_TRUE(profile.CreateHistoryService(true, false));
   profile.BlockUntilHistoryProcessesPendingRequests();
 
   CreateHistoryPageEntries();
   scoped_refptr<TestProfileWriter> profile_writer(
       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_);
 }