Fix componentization of chrome/browser/bookmarks

chrome/browser/bookmarks/managed_bookmark_service_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/browser/bookmarks/managed_bookmark_service_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/managed/managed_bookmark_service.h"

[sky, 2015/07/20 15:53:19]

nit: this should be the first include (line 5 old).

[sdefresne, 2015/07/20 17:43:40]

Done.

 #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;
 using bookmarks::BookmarkNode;
+using bookmarks::ManagedBookmarkService;
 using testing::Mock;
 using testing::_;
 
-class ChromeBookmarkClientTest : public testing::Test {
+class ManagedBookmarkServiceTest : public testing::Test {
  public:
-  ChromeBookmarkClientTest() : client_(NULL), model_(NULL) {}
-  ~ChromeBookmarkClientTest() override {}
+  ManagedBookmarkServiceTest() : managed_(NULL), model_(NULL) {}
+  ~ManagedBookmarkServiceTest() override {}
 
   void SetUp() override {
     prefs_ = profile_.GetTestingPrefService();
     ASSERT_FALSE(prefs_->HasPrefPath(bookmarks::prefs::kManagedBookmarks));
 
     prefs_->SetManagedPref(bookmarks::prefs::kManagedBookmarks,
                            CreateTestTree());
     ResetModel();
 
     // The managed node always exists.
-    ASSERT_TRUE(client_->managed_node());
-    ASSERT_TRUE(client_->managed_node()->parent() == model_->root_node());
-    EXPECT_NE(-1, model_->root_node()->GetIndexOf(client_->managed_node()));
+    ASSERT_TRUE(managed_->managed_node());
+    ASSERT_TRUE(managed_->managed_node()->parent() == model_->root_node());
+    EXPECT_NE(-1, model_->root_node()->GetIndexOf(managed_->managed_node()));
   }
 
   void TearDown() override { model_->RemoveObserver(&observer_); }
 
   void ResetModel() {
     profile_.CreateBookmarkModel(false);
     model_ = BookmarkModelFactory::GetForProfile(&profile_);
     bookmarks::test::WaitForBookmarkModelToLoad(model_);
     model_->AddObserver(&observer_);
-    client_ = ChromeBookmarkClientFactory::GetForProfile(&profile_);
-    DCHECK(client_);
+    managed_ = ManagedBookmarkServiceFactory::GetForProfile(&profile_);
+    DCHECK(managed_);
   }
 
   static base::DictionaryValue* CreateBookmark(const std::string& title,
                                                const std::string& url) {
     EXPECT_TRUE(GURL(url).is_valid());
     base::DictionaryValue* dict = new base::DictionaryValue();
     dict->SetString("name", title);
     dict->SetString("url", GURL(url).spec());
     return dict;
   }
@@ skipping 54 matching lines @@
     } else {
       return false;
     }
     return true;
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
   TestingPrefServiceSyncable* prefs_;
   bookmarks::MockBookmarkModelObserver observer_;
-  ChromeBookmarkClient* client_;
+  ManagedBookmarkService* managed_;
   BookmarkModel* model_;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClientTest);
+  DISALLOW_COPY_AND_ASSIGN(ManagedBookmarkServiceTest);
 };
 
-TEST_F(ChromeBookmarkClientTest, EmptyManagedNode) {
+TEST_F(ManagedBookmarkServiceTest, EmptyManagedNode) {
   // Verifies that the managed node is empty and invisible when the policy is
   // not set.
   model_->RemoveObserver(&observer_);
   prefs_->RemoveManagedPref(bookmarks::prefs::kManagedBookmarks);
   ResetModel();
 
-  ASSERT_TRUE(client_->managed_node());
-  EXPECT_TRUE(client_->managed_node()->empty());
-  EXPECT_FALSE(client_->managed_node()->IsVisible());
+  ASSERT_TRUE(managed_->managed_node());
+  EXPECT_TRUE(managed_->managed_node()->empty());
+  EXPECT_FALSE(managed_->managed_node()->IsVisible());
 }
 
-TEST_F(ChromeBookmarkClientTest, LoadInitial) {
+TEST_F(ManagedBookmarkServiceTest, LoadInitial) {
   // Verifies that the initial load picks up the initial policy too.
   EXPECT_TRUE(model_->bookmark_bar_node()->empty());
   EXPECT_TRUE(model_->other_node()->empty());
-  EXPECT_FALSE(client_->managed_node()->empty());
-  EXPECT_TRUE(client_->managed_node()->IsVisible());
+  EXPECT_FALSE(managed_->managed_node()->empty());
+  EXPECT_TRUE(managed_->managed_node()->IsVisible());
 
   scoped_ptr<base::DictionaryValue> expected(CreateExpectedTree());
-  EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+  EXPECT_TRUE(NodeMatchesValue(managed_->managed_node(), expected.get()));
 }
 
-TEST_F(ChromeBookmarkClientTest, SwapNodes) {
+TEST_F(ManagedBookmarkServiceTest, SwapNodes) {
   // 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());
 
   // These two nodes should just be swapped.
-  const BookmarkNode* parent = client_->managed_node();
+  const BookmarkNode* parent = managed_->managed_node();
   EXPECT_CALL(observer_, BookmarkNodeMoved(model_, parent, 1, parent, 0));
   prefs_->SetManagedPref(bookmarks::prefs::kManagedBookmarks,
                          updated->DeepCopy());
   Mock::VerifyAndClearExpectations(&observer_);
 
   // Verify the final tree.
   scoped_ptr<base::DictionaryValue> expected(
       CreateFolder(GetManagedFolderTitle(), updated.release()));
-  EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+  EXPECT_TRUE(NodeMatchesValue(managed_->managed_node(), expected.get()));
 }
 
-TEST_F(ChromeBookmarkClientTest, RemoveNode) {
+TEST_F(ManagedBookmarkServiceTest, RemoveNode) {
   // Remove the Folder.
   scoped_ptr<base::ListValue> updated(CreateTestTree());
   ASSERT_TRUE(updated->Remove(1, NULL));
 
-  const BookmarkNode* parent = client_->managed_node();
+  const BookmarkNode* parent = managed_->managed_node();
   EXPECT_CALL(observer_, BookmarkNodeRemoved(model_, parent, 1, _, _));
   prefs_->SetManagedPref(bookmarks::prefs::kManagedBookmarks,
                          updated->DeepCopy());
   Mock::VerifyAndClearExpectations(&observer_);
 
   // Verify the final tree.
   scoped_ptr<base::DictionaryValue> expected(
       CreateFolder(GetManagedFolderTitle(), updated.release()));
-  EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+  EXPECT_TRUE(NodeMatchesValue(managed_->managed_node(), expected.get()));
 }
 
-TEST_F(ChromeBookmarkClientTest, CreateNewNodes) {
+TEST_F(ManagedBookmarkServiceTest, CreateNewNodes) {
   // Put all the nodes inside another folder.
   scoped_ptr<base::ListValue> updated(new base::ListValue);
   updated->Append(CreateFolder("Container", CreateTestTree()));
 
   EXPECT_CALL(observer_, BookmarkNodeAdded(model_, _, _)).Times(5);
   // The remaining nodes have been pushed to positions 1 and 2; they'll both be
   // removed when at position 1.
-  const BookmarkNode* parent = client_->managed_node();
+  const BookmarkNode* parent = managed_->managed_node();
   EXPECT_CALL(observer_, BookmarkNodeRemoved(model_, parent, 1, _, _))
       .Times(2);
   prefs_->SetManagedPref(bookmarks::prefs::kManagedBookmarks,
                          updated->DeepCopy());
   Mock::VerifyAndClearExpectations(&observer_);
 
   // Verify the final tree.
   scoped_ptr<base::DictionaryValue> expected(
       CreateFolder(GetManagedFolderTitle(), updated.release()));
-  EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+  EXPECT_TRUE(NodeMatchesValue(managed_->managed_node(), expected.get()));
 }
 
-TEST_F(ChromeBookmarkClientTest, RemoveAllUserBookmarks) {
+TEST_F(ManagedBookmarkServiceTest, RemoveAllUserBookmarks) {
   // Remove the policy.
-  const BookmarkNode* parent = client_->managed_node();
+  const BookmarkNode* parent = managed_->managed_node();
   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());
+  EXPECT_TRUE(managed_->managed_node()->empty());
+  EXPECT_FALSE(managed_->managed_node()->IsVisible());
 }
 
-TEST_F(ChromeBookmarkClientTest, IsDescendantOfManagedNode) {
+TEST_F(ManagedBookmarkServiceTest, IsDescendantOfManagedNode) {
   EXPECT_FALSE(bookmarks::IsDescendantOf(model_->root_node(),
-                                         client_->managed_node()));
+                                         managed_->managed_node()));
   EXPECT_FALSE(bookmarks::IsDescendantOf(model_->bookmark_bar_node(),
-                                         client_->managed_node()));
+                                         managed_->managed_node()));
   EXPECT_FALSE(bookmarks::IsDescendantOf(model_->other_node(),
-                                         client_->managed_node()));
+                                         managed_->managed_node()));
   EXPECT_FALSE(bookmarks::IsDescendantOf(model_->mobile_node(),
-                                         client_->managed_node()));
-  EXPECT_TRUE(bookmarks::IsDescendantOf(client_->managed_node(),
-                                        client_->managed_node()));
+                                         managed_->managed_node()));
+  EXPECT_TRUE(bookmarks::IsDescendantOf(managed_->managed_node(),
+                                        managed_->managed_node()));
 
-  const BookmarkNode* parent = client_->managed_node();
+  const BookmarkNode* parent = managed_->managed_node();
   ASSERT_EQ(2, parent->child_count());
   EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(0),
-                                        client_->managed_node()));
+                                        managed_->managed_node()));
   EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(1),
-                                        client_->managed_node()));
+                                        managed_->managed_node()));
 
   parent = parent->GetChild(1);
   ASSERT_EQ(2, parent->child_count());
   EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(0),
-                                        client_->managed_node()));
+                                        managed_->managed_node()));
   EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(1),
-                                        client_->managed_node()));
+                                        managed_->managed_node()));
 }
 
-TEST_F(ChromeBookmarkClientTest, RemoveAllDoesntRemoveManaged) {
-  EXPECT_EQ(2, client_->managed_node()->child_count());
+TEST_F(ManagedBookmarkServiceTest, RemoveAllDoesntRemoveManaged) {
+  EXPECT_EQ(2, managed_->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(),
                  0,
                  base::ASCIIToUTF16("Test"),
                  GURL("http://google.com/"));
   model_->AddFolder(
       model_->bookmark_bar_node(), 1, base::ASCIIToUTF16("Test Folder"));
   EXPECT_EQ(2, model_->bookmark_bar_node()->child_count());
   Mock::VerifyAndClearExpectations(&observer_);
 
   EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_, _));
   model_->RemoveAllUserBookmarks();
-  EXPECT_EQ(2, client_->managed_node()->child_count());
+  EXPECT_EQ(2, managed_->managed_node()->child_count());
   EXPECT_EQ(0, model_->bookmark_bar_node()->child_count());
   Mock::VerifyAndClearExpectations(&observer_);
 }
 
-TEST_F(ChromeBookmarkClientTest, HasDescendantsOfManagedNode) {
+TEST_F(ManagedBookmarkServiceTest, 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);
+  const BookmarkNode* managed_node = managed_->managed_node()->GetChild(0);
   ASSERT_TRUE(managed_node);
 
   std::vector<const BookmarkNode*> nodes;
-  EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, client_->managed_node()));
+  EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, managed_->managed_node()));
   nodes.push_back(user_node);
-  EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, client_->managed_node()));
+  EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, managed_->managed_node()));
   nodes.push_back(managed_node);
-  EXPECT_TRUE(bookmarks::HasDescendantsOf(nodes, client_->managed_node()));
+  EXPECT_TRUE(bookmarks::HasDescendantsOf(nodes, managed_->managed_node()));
 }