Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8338)

Unified Diff: chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc

Issue 8759017: BookmarkModel cleanup. synced_node is now mobile_node and I'm nuking (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk fix sync_integration_tests and extension test Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
index a1ec34a4164fbe0db5d603e4bf6c2194505662e9..56fbe51a073cf2be78cc09a26c85a1be50004688 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
@@ -70,7 +70,7 @@ class BookmarkEditorGtkTest : public testing::Test {
// oa
// OF1
// of1a
- // synced node
+ // mobile node
// sa
void AddTestData() {
std::string test_base = base_path();
@@ -91,8 +91,8 @@ class BookmarkEditorGtkTest : public testing::Test {
model_->AddFolder(model_->other_node(), 1, ASCIIToUTF16("OF1"));
model_->AddURL(of1, 0, ASCIIToUTF16("of1a"), GURL(test_base + "of1a"));
- // Children of the synced node.
- model_->AddURL(model_->synced_node(), 0, ASCIIToUTF16("sa"),
+ // Children of the mobile node.
+ model_->AddURL(model_->mobile_node(), 0, ASCIIToUTF16("sa"),
GURL(test_base + "sa"));
}
@@ -118,14 +118,8 @@ TEST_F(BookmarkEditorGtkTest, ModelsMatch) {
GtkTreeIter bookmark_bar_node = toplevel;
ASSERT_TRUE(gtk_tree_model_iter_next(store, &toplevel));
GtkTreeIter other_node = toplevel;
- if (model_->synced_node()->IsVisible()) {
- // If we have a synced node, then the iterator should find one element after
- // "other bookmarks"
- ASSERT_TRUE(gtk_tree_model_iter_next(store, &toplevel));
- ASSERT_FALSE(gtk_tree_model_iter_next(store, &toplevel));
- } else {
- ASSERT_FALSE(gtk_tree_model_iter_next(store, &toplevel));
- }
+ ASSERT_TRUE(gtk_tree_model_iter_next(store, &toplevel));
+ ASSERT_FALSE(gtk_tree_model_iter_next(store, &toplevel));
// The bookmark bar should have 2 nodes: folder F1 and F2.
GtkTreeIter f1_iter;

Powered by Google App Engine
This is Rietveld 408576698