Allow embedder to force visibility of permanent nodes

chrome/browser/bookmarks/bookmark_model_unittest.cc

Index: chrome/browser/bookmarks/bookmark_model_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index 8198b21c57d9af5100446b91cc9c8a23f5321ee2..b04d84122cbfcef85170cc62159cffa929c4dd48 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -1061,28 +1061,31 @@ TEST_F(BookmarkModelTest, Reorder) {
 }
 
 TEST_F(BookmarkModelTest, NodeVisibility) {
+  // Mobile node invisible by default
   EXPECT_TRUE(model_->bookmark_bar_node()->IsVisible());
   EXPECT_TRUE(model_->other_node()->IsVisible());
-  // Mobile node invisible by default
   EXPECT_FALSE(model_->mobile_node()->IsVisible());
 
-  // Change visibility of permanent nodes.
+  // Visibility of permanent node can only be changed if they are not
+  // forced to be visible by the client.
   model_->SetPermanentNodeVisible(BookmarkNode::BOOKMARK_BAR, false);
-  EXPECT_FALSE(model_->bookmark_bar_node()->IsVisible());
+  EXPECT_TRUE(model_->bookmark_bar_node()->IsVisible());
   model_->SetPermanentNodeVisible(BookmarkNode::OTHER_NODE, false);
-  EXPECT_FALSE(model_->other_node()->IsVisible());
+  EXPECT_TRUE(model_->other_node()->IsVisible());
   model_->SetPermanentNodeVisible(BookmarkNode::MOBILE, true);
   EXPECT_TRUE(model_->mobile_node()->IsVisible());
+  model_->SetPermanentNodeVisible(BookmarkNode::MOBILE, false);
+  EXPECT_FALSE(model_->mobile_node()->IsVisible());
 
   // Arbitrary node should be visible
   TestNode bbn;
   PopulateNodeFromString("B", &bbn);
-  const BookmarkNode* parent = model_->bookmark_bar_node();
+  const BookmarkNode* parent = model_->mobile_node();
   PopulateBookmarkNode(&bbn, model_.get(), parent);
   EXPECT_TRUE(parent->GetChild(0)->IsVisible());
 
-  // Bookmark bar should be visible now that it has a child.
-  EXPECT_TRUE(model_->bookmark_bar_node()->IsVisible());
+  // Mobile folder should be visible now that it has a child.
+  EXPECT_TRUE(model_->mobile_node()->IsVisible());
 }
 
 TEST_F(BookmarkModelTest, MobileNodeVisibileWithChildren) {