Managed bookmarks for supervised users

components/policy/core/browser/managed_bookmarks_tracker_unittest.cc

Index: components/policy/core/browser/managed_bookmarks_tracker_unittest.cc
diff --git a/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc b/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc
index 238fac48387f869308d9ea7195c1cf6e0bc2342a..ec79aa3a63bd3bd2ec2879a4af68f72a709d8f54 100644
--- a/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc
+++ b/components/policy/core/browser/managed_bookmarks_tracker_unittest.cc
@@ -37,6 +37,7 @@ class ManagedBookmarksTrackerTest : public testing::Test {
 
   void SetUp() override {
     prefs_.registry()->RegisterListPref(bookmarks::prefs::kManagedBookmarks);
+    prefs_.registry()->RegisterListPref(bookmarks::prefs::kSupervisedBookmarks);
     prefs_.registry()->RegisterListPref(
         bookmarks::prefs::kBookmarkEditorExpandedNodes);
   }
@@ -47,13 +48,20 @@ class ManagedBookmarksTrackerTest : public testing::Test {
   }
 
   void CreateModel() {

[bartfab (slow), 2015/01/26 15:40:14]

Nit: Please remove this method and replace all callers with something like:

CreateModel(false /* is_supervised */);

[Marc Treib, 2015/01/26 16:16:48]

Done.

+    CreateModel(false);
+  }
+
+  void CreateModel(bool is_supervised) {
     // Simulate the creation of the managed node by the BookmarkClient.
     BookmarkPermanentNode* managed_node = new BookmarkPermanentNode(100);
     policy::ManagedBookmarksTracker::LoadInitial(
-        managed_node, prefs_.GetList(bookmarks::prefs::kManagedBookmarks), 101);
+        managed_node,
+        prefs_.GetList(ManagedBookmarksTracker::GetPrefName(is_supervised)),
+        101);
     managed_node->set_visible(!managed_node->empty());
     managed_node->SetTitle(l10n_util::GetStringUTF16(
-        IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME));
+        is_supervised ? IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME
+                      : IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME));
 
     bookmarks::BookmarkPermanentNodeList extra_nodes;
     extra_nodes.push_back(managed_node);
@@ -77,6 +85,7 @@ class ManagedBookmarksTrackerTest : public testing::Test {
     managed_bookmarks_tracker_.reset(new ManagedBookmarksTracker(
         model_.get(),
         &prefs_,
+        is_supervised,
         base::Bind(&ManagedBookmarksTrackerTest::GetManagementDomain)));
     managed_bookmarks_tracker_->Init(managed_node_);
   }
@@ -191,6 +200,23 @@ TEST_F(ManagedBookmarksTrackerTest, LoadInitial) {
   EXPECT_TRUE(NodeMatchesValue(managed_node(), expected.get()));
 }
 
+TEST_F(ManagedBookmarksTrackerTest, SupervisedTrackerIgnoresManagedPref) {
+  prefs_.SetManagedPref(bookmarks::prefs::kManagedBookmarks, CreateTestTree());
+  CreateModel(true);

[bartfab (slow), 2015/01/26 15:40:14]

Nit: Add /* is_supervised */

[Marc Treib, 2015/01/26 16:16:48]

Done.

+  EXPECT_TRUE(managed_node()->empty());
+  EXPECT_FALSE(managed_node()->IsVisible());
+}
+
+TEST_F(ManagedBookmarksTrackerTest, SupervisedTrackerHandlesSupervisedPref) {
+  prefs_.SetManagedPref(bookmarks::prefs::kSupervisedBookmarks,
+                        CreateTestTree());
+  CreateModel(true);

[bartfab (slow), 2015/01/26 15:40:14]

Nit: Add /* is_supervised */

[Marc Treib, 2015/01/26 16:16:48]

Done.

+  EXPECT_FALSE(managed_node()->empty());
+  EXPECT_TRUE(managed_node()->IsVisible());
+  // Don't bother checking the actual contents, the non-supervised tests cover

[bartfab (slow), 2015/01/26 15:40:14]

You could parameterize the test and verify that both managed and supervised are
handled correctly. There is no way to guarantee that the code paths which handle
managed and supervised will not diverge at some point.

[Marc Treib, 2015/01/26 16:16:47]

Hm. It's not "the test", but "every test in this file".
I think it's fairly unlikely that managed vs supervised will diverge (or if they
do, then they likely won't use the same class anymore anyway), so I don't think
it's worth it to parameterize/duplicate the tests.

+  // that already.
+}
+
 TEST_F(ManagedBookmarksTrackerTest, SwapNodes) {
   prefs_.SetManagedPref(bookmarks::prefs::kManagedBookmarks, CreateTestTree());
   CreateModel();