Made BookmarkService::GetBookmarks return both urls and title.

chrome/browser/bookmarks/bookmark_model.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 "chrome/browser/bookmarks/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/bind.h"
@@ skipping 382 matching lines @@
 bool BookmarkModel::HasBookmarks() {
   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<GURL>* urls) {
+void BookmarkModel::GetBookmarks(
+    std::vector<BookmarkService::Bookmark>* 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)
-      urls->push_back(*url);
+    if (!last_url || *url != *last_url) {
+      BookmarkService::Bookmark bookmark;
+      bookmark.url = *url;
+      bookmark.title = (*i)->GetTitle();
+      bookmarks->push_back(bookmark);
+    }
     last_url = url;
   }
 }
 
 void BookmarkModel::BlockTillLoaded() {
   loaded_signal_.Wait();
 }
 
 const BookmarkNode* BookmarkModel::GetNodeByID(int64 id) const {
   // TODO(sky): TreeNode needs a method that visits all nodes using a predicate.
@@ skipping 443 matching lines @@
 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() {
   BookmarkPermanentNode* bb_node =
       CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
   BookmarkPermanentNode* other_node =
       CreatePermanentNode(BookmarkNode::OTHER_NODE);
   BookmarkPermanentNode* mobile_node =
       CreatePermanentNode(BookmarkNode::MOBILE);
   return new BookmarkLoadDetails(bb_node, other_node, mobile_node,
                                  new BookmarkIndex(profile_), next_node_id_);
 }