Managed bookmarks for supervised users

components/policy/core/browser/managed_bookmarks_tracker_unittest.cc

 // Copyright 2014 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 "components/policy/core/browser/managed_bookmarks_tracker.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 19 matching lines @@
 
 namespace policy {
 
 class ManagedBookmarksTrackerTest : public testing::Test {
  public:
   ManagedBookmarksTrackerTest() : managed_node_(NULL) {}
   ~ManagedBookmarksTrackerTest() override {}
 
   void SetUp() override {
     prefs_.registry()->RegisterListPref(bookmarks::prefs::kManagedBookmarks);
+    prefs_.registry()->RegisterListPref(bookmarks::prefs::kSupervisedBookmarks);
     prefs_.registry()->RegisterListPref(
         bookmarks::prefs::kBookmarkEditorExpandedNodes);
   }
 
   void TearDown() override {
     if (model_)
       model_->RemoveObserver(&observer_);
   }
 
   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);
     client_.SetExtraNodesToLoad(extra_nodes.Pass());
 
     model_.reset(new BookmarkModel(&client_));
     model_->AddObserver(&observer_);
     EXPECT_CALL(observer_, BookmarkModelLoaded(model_.get(), _));
     model_->Load(&prefs_,
                  std::string(),
                  base::FilePath(),
                  base::MessageLoopProxy::current(),
                  base::MessageLoopProxy::current());
     bookmarks::test::WaitForBookmarkModelToLoad(model_.get());
     Mock::VerifyAndClearExpectations(&observer_);
 
     ASSERT_EQ(1u, client_.extra_nodes().size());
     managed_node_ = client_.extra_nodes()[0];
     ASSERT_EQ(managed_node, managed_node_);
 
     managed_bookmarks_tracker_.reset(new ManagedBookmarksTracker(
         model_.get(),
         &prefs_,
+        is_supervised,
         base::Bind(&ManagedBookmarksTrackerTest::GetManagementDomain)));
     managed_bookmarks_tracker_->Init(managed_node_);
   }
 
   const BookmarkNode* managed_node() {
     return managed_node_;
   }
 
   bool IsManaged(const BookmarkNode* node) {
     return node && node->HasAncestor(managed_node_);
@@ skipping 94 matching lines @@
   CreateModel();
   EXPECT_TRUE(model_->bookmark_bar_node()->empty());
   EXPECT_TRUE(model_->other_node()->empty());
   EXPECT_FALSE(managed_node()->empty());
   EXPECT_TRUE(managed_node()->IsVisible());
 
   scoped_ptr<base::DictionaryValue> expected(CreateExpectedTree());
   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();
 
   // Swap the Google bookmark with the Folder.
   scoped_ptr<base::ListValue> updated(CreateTestTree());
   scoped_ptr<base::Value> removed;
   ASSERT_TRUE(updated->Remove(0, &removed));
   updated->Append(removed.release());
 
@@ skipping 110 matching lines @@
   Mock::VerifyAndClearExpectations(&observer_);
 
   EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_.get(), _));
   model_->RemoveAllUserBookmarks();
   EXPECT_EQ(2, managed_node()->child_count());
   EXPECT_EQ(0, model_->bookmark_bar_node()->child_count());
   Mock::VerifyAndClearExpectations(&observer_);
 }
 
 }  // namespace policy