Managed bookmarks for supervised users

chrome/browser/bookmarks/chrome_bookmark_client_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 "chrome/browser/bookmarks/chrome_bookmark_client.h"
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_node.h"
+#include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/bookmarks/test/mock_bookmark_model_observer.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "grit/components_strings.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using bookmarks::BookmarkModel;
@@ skipping 196 matching lines @@
   EXPECT_CALL(observer_, BookmarkNodeRemoved(model_, parent, 0, _, _))
       .Times(2);
   prefs_->RemoveManagedPref(bookmarks::prefs::kManagedBookmarks);
   Mock::VerifyAndClearExpectations(&observer_);
 
   EXPECT_TRUE(client_->managed_node()->empty());
   EXPECT_FALSE(client_->managed_node()->IsVisible());
 }
 
 TEST_F(ChromeBookmarkClientTest, IsDescendantOfManagedNode) {
-  EXPECT_FALSE(client_->IsDescendantOfManagedNode(model_->root_node()));
-  EXPECT_FALSE(client_->IsDescendantOfManagedNode(model_->bookmark_bar_node()));
-  EXPECT_FALSE(client_->IsDescendantOfManagedNode(model_->other_node()));
-  EXPECT_FALSE(client_->IsDescendantOfManagedNode(model_->mobile_node()));
-  EXPECT_TRUE(client_->IsDescendantOfManagedNode(client_->managed_node()));
+  EXPECT_FALSE(bookmarks::IsDescendantOf(model_->root_node(),
+                                         client_->managed_node()));
+  EXPECT_FALSE(bookmarks::IsDescendantOf(model_->bookmark_bar_node(),
+                                         client_->managed_node()));
+  EXPECT_FALSE(bookmarks::IsDescendantOf(model_->other_node(),
+                                         client_->managed_node()));
+  EXPECT_FALSE(bookmarks::IsDescendantOf(model_->mobile_node(),
+                                         client_->managed_node()));
+  EXPECT_TRUE(bookmarks::IsDescendantOf(client_->managed_node(),
+                                        client_->managed_node()));
 
   const BookmarkNode* parent = client_->managed_node();
   ASSERT_EQ(2, parent->child_count());
-  EXPECT_TRUE(client_->IsDescendantOfManagedNode(parent->GetChild(0)));
-  EXPECT_TRUE(client_->IsDescendantOfManagedNode(parent->GetChild(1)));
+  EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(0),
+                                        client_->managed_node()));
+  EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(1),
+                                        client_->managed_node()));
 
   parent = parent->GetChild(1);
   ASSERT_EQ(2, parent->child_count());
-  EXPECT_TRUE(client_->IsDescendantOfManagedNode(parent->GetChild(0)));
-  EXPECT_TRUE(client_->IsDescendantOfManagedNode(parent->GetChild(1)));
+  EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(0),
+                                        client_->managed_node()));
+  EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(1),
+                                        client_->managed_node()));
 }
 
 TEST_F(ChromeBookmarkClientTest, RemoveAllDoesntRemoveManaged) {
   EXPECT_EQ(2, client_->managed_node()->child_count());
 
   EXPECT_CALL(observer_,
               BookmarkNodeAdded(model_, model_->bookmark_bar_node(), 0));
   EXPECT_CALL(observer_,
               BookmarkNodeAdded(model_, model_->bookmark_bar_node(), 1));
   model_->AddURL(model_->bookmark_bar_node(),
@@ skipping 14 matching lines @@
 
 TEST_F(ChromeBookmarkClientTest, HasDescendantsOfManagedNode) {
   const BookmarkNode* user_node = model_->AddURL(model_->other_node(),
                                                  0,
                                                  base::ASCIIToUTF16("foo bar"),
                                                  GURL("http://www.google.com"));
   const BookmarkNode* managed_node = client_->managed_node()->GetChild(0);
   ASSERT_TRUE(managed_node);
 
   std::vector<const BookmarkNode*> nodes;
-  EXPECT_FALSE(client_->HasDescendantsOfManagedNode(nodes));
+  EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, client_->managed_node()));
   nodes.push_back(user_node);
-  EXPECT_FALSE(client_->HasDescendantsOfManagedNode(nodes));
+  EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, client_->managed_node()));
   nodes.push_back(managed_node);
-  EXPECT_TRUE(client_->HasDescendantsOfManagedNode(nodes));
+  EXPECT_TRUE(bookmarks::HasDescendantsOf(nodes, client_->managed_node()));
 }