Made BookmarkService::GetBookmarks return both urls and title.

chrome/browser/history/android/bookmark_model_sql_handler_unittest.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/history/android/bookmark_model_sql_handler.h"
 
 #include "base/synchronization/waitable_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/history/history_database.h"
@@ skipping 119 matching lines @@
   TableIDRow id_row;
   id_row.url_id = url_id;
   id_row.url = url_row.url();
   TableIDRows id_rows;
   id_rows.push_back(id_row);
 
   BookmarkModelSQLHandler handler(&history_db_);
   ASSERT_TRUE(handler.Update(row, id_rows));
   RunMessageLoopForUI();
   // Get all bookmarks and verify there is only one.
-  std::vector<GURL> urls;
-  bookmark_model_->GetBookmarks(&urls);
-  EXPECT_EQ(1u, urls.size());
-  EXPECT_EQ(url_row.url(), urls[0]);
+  std::vector<BookmarkService::Bookmark> bookmarks;
+  bookmark_model_->GetBookmarks(&bookmarks);
+  ASSERT_EQ(1u, bookmarks.size());
+  EXPECT_EQ(url_row.url(), bookmarks[0].url);
+  EXPECT_EQ(url_row.title(), bookmarks[0].title);
+
   // Get the bookmark node.
   std::vector<const BookmarkNode*> nodes;
   bookmark_model_->GetNodesByURL(row.url(), &nodes);
   ASSERT_EQ(1u, nodes.size());
   EXPECT_EQ(url_row.title(), nodes[0]->GetTitle());
   const BookmarkNode* parent = nodes[0]->parent();
   ASSERT_TRUE(parent);
   EXPECT_EQ(bookmark_model_->mobile_node()->id(), parent->id());
 
   // Remove the bookmark
   row.set_is_bookmark(false);
   ASSERT_TRUE(handler.Update(row, id_rows));
   RunMessageLoopForUI();
-  urls.clear();
-  bookmark_model_->GetBookmarks(&urls);
-  EXPECT_TRUE(urls.empty());
+  bookmarks.clear();
+  bookmark_model_->GetBookmarks(&bookmarks);
+  EXPECT_TRUE(bookmarks.empty());
 
   // Update with the parent id.
   row.set_parent_id(bookmark_model_->other_node()->id());
   row.set_is_bookmark(true);
   ASSERT_TRUE(handler.Update(row, id_rows));
   RunMessageLoopForUI();
   // Get all bookmarks and verify there is only one.
-  urls.clear();
-  bookmark_model_->GetBookmarks(&urls);
-  EXPECT_EQ(1u, urls.size());
-  EXPECT_EQ(url_row.url(), urls[0]);
+  bookmarks.clear();
+  bookmark_model_->GetBookmarks(&bookmarks);
+  ASSERT_EQ(1u, bookmarks.size());
+  EXPECT_EQ(url_row.url(), bookmarks[0].url);
+  EXPECT_EQ(url_row.title(), bookmarks[0].title);
   // Get the bookmark node.
   nodes.clear();
   bookmark_model_->GetNodesByURL(row.url(), &nodes);
   ASSERT_EQ(1u, nodes.size());
   EXPECT_EQ(url_row.title(), nodes[0]->GetTitle());
   const BookmarkNode* parent1 = nodes[0]->parent();
   ASSERT_TRUE(parent1);
   EXPECT_EQ(row.parent_id(), parent1->id());
 
   // Only update the title.
   url_row.set_title(UTF8ToUTF16("Google Inc."));
   history_db_.UpdateURLRow(url_id, url_row);
   HistoryAndBookmarkRow update_title;
   update_title.set_title(url_row.title());
   ASSERT_TRUE(handler.Update(update_title, id_rows));
   RunMessageLoopForUI();
   // Get all bookmarks and verify there is only one.
-  urls.clear();
-  bookmark_model_->GetBookmarks(&urls);
-  EXPECT_EQ(1u, urls.size());
-  EXPECT_EQ(url_row.url(), urls[0]);
+  bookmarks.clear();
+  bookmark_model_->GetBookmarks(&bookmarks);
+  ASSERT_EQ(1u, bookmarks.size());
+  EXPECT_EQ(url_row.url(), bookmarks[0].url);
+  EXPECT_EQ(url_row.title(), bookmarks[0].title);
   // Get the bookmark node.
   nodes.clear();
   bookmark_model_->GetNodesByURL(row.url(), &nodes);
   ASSERT_EQ(1u, nodes.size());
   EXPECT_EQ(url_row.title(), nodes[0]->GetTitle());
   const BookmarkNode* parent2 = nodes[0]->parent();
   ASSERT_TRUE(parent2);
   // The parent id shouldn't changed.
   EXPECT_EQ(row.parent_id(), parent2->id());
 }
@@ skipping 37 matching lines @@
   id_row.url = url1;
   id_rows.clear();
   id_rows.push_back(id_row);
   ASSERT_TRUE(handler.Delete(id_rows));
   RunMessageLoopForUI();
   // All bookmarks were deleted.
   EXPECT_FALSE(bookmark_model_->HasBookmarks());
 }
 
 }  // namespace history