Revert "Revert 84829 - Initial implementation of "Synced Bookmarks" folder."

chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc

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 318f2467daf3464a2f5b5392e52e5ea8cc7e1747..c31bcd5b9d04d847ac54c7095cd7d8f7428202cd 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc
@@ -71,6 +71,8 @@ class BookmarkEditorGtkTest : public testing::Test {
   //   oa
   //   OF1
   //     of1a
+  // synced node
+  //   sa
   void AddTestData() {
     std::string test_base = base_path();
 
@@ -89,6 +91,10 @@ class BookmarkEditorGtkTest : public testing::Test {
     const BookmarkNode* of1 =
         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"),
+                   GURL(test_base + "sa"));
   }
 };
 
@@ -111,7 +117,11 @@ TEST_F(BookmarkEditorGtkTest, ModelsMatch) {
   // The bookmark bar should have 2 nodes: folder F1 and F2.
   GtkTreeIter f1_iter;
   GtkTreeIter child;
-  ASSERT_EQ(2, gtk_tree_model_iter_n_children(store, &bookmark_bar_node));
+  if (model_->synced_node()->IsVisible()) {
+    ASSERT_EQ(3, gtk_tree_model_iter_n_children(store, &bookmark_bar_node));
+  } else {
+    ASSERT_EQ(2, gtk_tree_model_iter_n_children(store, &bookmark_bar_node));
+  }
   ASSERT_TRUE(gtk_tree_model_iter_children(store, &child, &bookmark_bar_node));
   f1_iter = child;
   ASSERT_EQ("F1", UTF16ToUTF8(GetTitleFromTreeIter(store, &child)));