Remove the BookmarkService interface

chrome/browser/ui/bookmarks/bookmark_browsertest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 77 matching lines @@
 #if defined(THREAD_SANITIZER)
 // BookmarkBrowsertest.Persist fails under ThreadSanitizer on Linux, see
 // http://crbug.com/340223.
 #define MAYBE_Persist DISABLED_Persist
 #else
 #define MAYBE_Persist Persist
 #endif
 IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, MAYBE_Persist) {
   BookmarkModel* bookmark_model = WaitForBookmarkModel(browser()->profile());
 
-  std::vector<BookmarkService::URLAndTitle> urls;
+  std::vector<BookmarkModel::URLAndTitle> urls;
   bookmark_model->GetBookmarks(&urls);
 
   ASSERT_EQ(1u, urls.size());
   ASSERT_EQ(GURL(kPersistBookmarkURL), urls[0].url);
   ASSERT_EQ(base::ASCIIToUTF16(kPersistBookmarkTitle), urls[0].title);
 }
 
 #if !defined(OS_CHROMEOS)  // No multi-profile on ChromeOS.
 
 // Sanity check that bookmarks from different profiles are separate.
 // DISABLED_ because it regularly times out: http://crbug.com/159002.
 IN_PROC_BROWSER_TEST_F(BookmarkBrowsertest, DISABLED_MultiProfile) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   BookmarkModel* bookmark_model1 = WaitForBookmarkModel(browser()->profile());
 
   ui_test_utils::BrowserAddedObserver observer;
   g_browser_process->profile_manager()->CreateMultiProfileAsync(
       base::string16(), base::string16(), ProfileManager::CreateCallback(),
       std::string());
   Browser* browser2 = observer.WaitForSingleNewBrowser();
   BookmarkModel* bookmark_model2 = WaitForBookmarkModel(browser2->profile());
 
   bookmark_utils::AddIfNotBookmarked(
       bookmark_model1, GURL(kPersistBookmarkURL),
       base::ASCIIToUTF16(kPersistBookmarkTitle));
-  std::vector<BookmarkService::URLAndTitle> urls1, urls2;
+  std::vector<BookmarkModel::URLAndTitle> urls1, urls2;
   bookmark_model1->GetBookmarks(&urls1);
   bookmark_model2->GetBookmarks(&urls2);
   ASSERT_EQ(1u, urls1.size());
   ASSERT_TRUE(urls2.empty());
 }
 
 #endif