Remove the BookmarkService interface

components/bookmarks/browser/bookmark_model.cc

 // Copyright 2014 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 "components/bookmarks/browser/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/bind.h"
@@ skipping 501 matching lines @@
   base::AutoLock url_lock(url_lock_);
   return !nodes_ordered_by_url_set_.empty();
 }
 
 bool BookmarkModel::IsBookmarked(const GURL& url) {
   base::AutoLock url_lock(url_lock_);
   return IsBookmarkedNoLock(url);
 }
 
 void BookmarkModel::GetBookmarks(
-    std::vector<BookmarkService::URLAndTitle>* bookmarks) {
+    std::vector<BookmarkModel::URLAndTitle>* bookmarks) {
   base::AutoLock url_lock(url_lock_);
   const GURL* last_url = NULL;
   for (NodesOrderedByURLSet::iterator i = nodes_ordered_by_url_set_.begin();
        i != nodes_ordered_by_url_set_.end(); ++i) {
     const GURL* url = &((*i)->url());
     // Only add unique URLs.
     if (!last_url || *url != *last_url) {
-      BookmarkService::URLAndTitle bookmark;
+      BookmarkModel::URLAndTitle bookmark;
       bookmark.url = *url;
       bookmark.title = (*i)->GetTitle();
       bookmarks->push_back(bookmark);
     }
     last_url = url;
   }
 }
 
 void BookmarkModel::BlockTillLoaded() {
   loaded_signal_.Wait();
@@ skipping 439 matching lines @@
       CreatePermanentNode(BookmarkNode::OTHER_NODE);
   BookmarkPermanentNode* mobile_node =
       CreatePermanentNode(BookmarkNode::MOBILE);
   return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails(
       bb_node,
       other_node,
       mobile_node,
       new BookmarkIndex(client_, index_urls_, accept_languages),
       next_node_id_));
 }