Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2647)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc

Issue 1203713002: Limit access to ChromeBookmarkClient to bookmarks code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_bookmark_client
Patch Set: Rebase Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/bookmarks/chrome_bookmark_client.cc ('k') | chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc » ('j') | components/bookmarks/browser/bookmark_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc b/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
index 6a6dd17a53fe4251313ea78893c6ea46601f7288..04dca5e271271e848f136e2a3d5facde543fc4b1 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
+++ b/chrome/browser/bookmarks/chrome_bookmark_client_unittest.cc
@@ -9,8 +9,6 @@
#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"
@@ -32,7 +30,7 @@ using testing::_;
class ChromeBookmarkClientTest : public testing::Test {
public:
- ChromeBookmarkClientTest() : client_(NULL), model_(NULL) {}
+ ChromeBookmarkClientTest() : model_(nullptr) {}
~ChromeBookmarkClientTest() override {}
void SetUp() override {
@@ -44,9 +42,9 @@ class ChromeBookmarkClientTest : public testing::Test {
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(model_->managed_node());
+ ASSERT_TRUE(model_->managed_node()->parent() == model_->root_node());
+ EXPECT_NE(-1, model_->root_node()->GetIndexOf(model_->managed_node()));
}
void TearDown() override { model_->RemoveObserver(&observer_); }
@@ -56,8 +54,6 @@ class ChromeBookmarkClientTest : public testing::Test {
model_ = BookmarkModelFactory::GetForProfile(&profile_);
bookmarks::test::WaitForBookmarkModelToLoad(model_);
model_->AddObserver(&observer_);
- client_ = ChromeBookmarkClientFactory::GetForProfile(&profile_);
- DCHECK(client_);
}
static base::DictionaryValue* CreateBookmark(const std::string& title,
@@ -106,13 +102,13 @@ class ChromeBookmarkClientTest : public testing::Test {
return false;
if (node->is_folder()) {
- const base::ListValue* children = NULL;
+ const base::ListValue* children = nullptr;
if (!dict->GetList("children", &children) ||
node->child_count() != static_cast<int>(children->GetSize())) {
return false;
}
for (int i = 0; i < node->child_count(); ++i) {
- const base::DictionaryValue* child = NULL;
+ const base::DictionaryValue* child = nullptr;
if (!children->GetDictionary(i, &child) ||
!NodeMatchesValue(node->GetChild(i), child)) {
return false;
@@ -132,7 +128,6 @@ class ChromeBookmarkClientTest : public testing::Test {
TestingProfile profile_;
TestingPrefServiceSyncable* prefs_;
bookmarks::MockBookmarkModelObserver observer_;
- ChromeBookmarkClient* client_;
BookmarkModel* model_;
DISALLOW_COPY_AND_ASSIGN(ChromeBookmarkClientTest);
@@ -145,20 +140,20 @@ TEST_F(ChromeBookmarkClientTest, EmptyManagedNode) {
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(model_->managed_node());
+ EXPECT_TRUE(model_->managed_node()->empty());
+ EXPECT_FALSE(model_->managed_node()->IsVisible());
}
TEST_F(ChromeBookmarkClientTest, 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(model_->managed_node()->empty());
+ EXPECT_TRUE(model_->managed_node()->IsVisible());
scoped_ptr<base::DictionaryValue> expected(CreateExpectedTree());
- EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+ EXPECT_TRUE(NodeMatchesValue(model_->managed_node(), expected.get()));
}
TEST_F(ChromeBookmarkClientTest, SwapNodes) {
@@ -169,7 +164,7 @@ TEST_F(ChromeBookmarkClientTest, SwapNodes) {
updated->Append(removed.release());
// These two nodes should just be swapped.
- const BookmarkNode* parent = client_->managed_node();
+ const BookmarkNode* parent = model_->managed_node();
EXPECT_CALL(observer_, BookmarkNodeMoved(model_, parent, 1, parent, 0));
prefs_->SetManagedPref(bookmarks::prefs::kManagedBookmarks,
updated->DeepCopy());
@@ -178,15 +173,15 @@ TEST_F(ChromeBookmarkClientTest, SwapNodes) {
// Verify the final tree.
scoped_ptr<base::DictionaryValue> expected(
CreateFolder(GetManagedFolderTitle(), updated.release()));
- EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+ EXPECT_TRUE(NodeMatchesValue(model_->managed_node(), expected.get()));
}
TEST_F(ChromeBookmarkClientTest, RemoveNode) {
// Remove the Folder.
scoped_ptr<base::ListValue> updated(CreateTestTree());
- ASSERT_TRUE(updated->Remove(1, NULL));
+ ASSERT_TRUE(updated->Remove(1, nullptr));
- const BookmarkNode* parent = client_->managed_node();
+ const BookmarkNode* parent = model_->managed_node();
EXPECT_CALL(observer_, BookmarkNodeRemoved(model_, parent, 1, _, _));
prefs_->SetManagedPref(bookmarks::prefs::kManagedBookmarks,
updated->DeepCopy());
@@ -195,7 +190,7 @@ TEST_F(ChromeBookmarkClientTest, RemoveNode) {
// Verify the final tree.
scoped_ptr<base::DictionaryValue> expected(
CreateFolder(GetManagedFolderTitle(), updated.release()));
- EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+ EXPECT_TRUE(NodeMatchesValue(model_->managed_node(), expected.get()));
}
TEST_F(ChromeBookmarkClientTest, CreateNewNodes) {
@@ -206,7 +201,7 @@ TEST_F(ChromeBookmarkClientTest, CreateNewNodes) {
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 = model_->managed_node();
EXPECT_CALL(observer_, BookmarkNodeRemoved(model_, parent, 1, _, _))
.Times(2);
prefs_->SetManagedPref(bookmarks::prefs::kManagedBookmarks,
@@ -216,50 +211,50 @@ TEST_F(ChromeBookmarkClientTest, CreateNewNodes) {
// Verify the final tree.
scoped_ptr<base::DictionaryValue> expected(
CreateFolder(GetManagedFolderTitle(), updated.release()));
- EXPECT_TRUE(NodeMatchesValue(client_->managed_node(), expected.get()));
+ EXPECT_TRUE(NodeMatchesValue(model_->managed_node(), expected.get()));
}
TEST_F(ChromeBookmarkClientTest, RemoveAllUserBookmarks) {
// Remove the policy.
- const BookmarkNode* parent = client_->managed_node();
+ const BookmarkNode* parent = model_->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(model_->managed_node()->empty());
+ EXPECT_FALSE(model_->managed_node()->IsVisible());
}
TEST_F(ChromeBookmarkClientTest, IsDescendantOfManagedNode) {
- EXPECT_FALSE(bookmarks::IsDescendantOf(model_->root_node(),
- client_->managed_node()));
+ EXPECT_FALSE(
+ bookmarks::IsDescendantOf(model_->root_node(), model_->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();
+ model_->managed_node()));
+ EXPECT_FALSE(
+ bookmarks::IsDescendantOf(model_->other_node(), model_->managed_node()));
+ EXPECT_FALSE(
+ bookmarks::IsDescendantOf(model_->mobile_node(), model_->managed_node()));
+ EXPECT_TRUE(bookmarks::IsDescendantOf(model_->managed_node(),
+ model_->managed_node()));
+
+ const BookmarkNode* parent = model_->managed_node();
ASSERT_EQ(2, parent->child_count());
- EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(0),
- client_->managed_node()));
- EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(1),
- client_->managed_node()));
+ EXPECT_TRUE(
+ bookmarks::IsDescendantOf(parent->GetChild(0), model_->managed_node()));
+ EXPECT_TRUE(
+ bookmarks::IsDescendantOf(parent->GetChild(1), model_->managed_node()));
parent = parent->GetChild(1);
ASSERT_EQ(2, parent->child_count());
- EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(0),
- client_->managed_node()));
- EXPECT_TRUE(bookmarks::IsDescendantOf(parent->GetChild(1),
- client_->managed_node()));
+ EXPECT_TRUE(
+ bookmarks::IsDescendantOf(parent->GetChild(0), model_->managed_node()));
+ EXPECT_TRUE(
+ bookmarks::IsDescendantOf(parent->GetChild(1), model_->managed_node()));
}
TEST_F(ChromeBookmarkClientTest, RemoveAllDoesntRemoveManaged) {
- EXPECT_EQ(2, client_->managed_node()->child_count());
+ EXPECT_EQ(2, model_->managed_node()->child_count());
EXPECT_CALL(observer_,
BookmarkNodeAdded(model_, model_->bookmark_bar_node(), 0));
@@ -276,7 +271,7 @@ TEST_F(ChromeBookmarkClientTest, RemoveAllDoesntRemoveManaged) {
EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_, _));
model_->RemoveAllUserBookmarks();
- EXPECT_EQ(2, client_->managed_node()->child_count());
+ EXPECT_EQ(2, model_->managed_node()->child_count());
EXPECT_EQ(0, model_->bookmark_bar_node()->child_count());
Mock::VerifyAndClearExpectations(&observer_);
}
@@ -286,13 +281,13 @@ TEST_F(ChromeBookmarkClientTest, HasDescendantsOfManagedNode) {
0,
base::ASCIIToUTF16("foo bar"),
GURL("http://www.google.com"));
- const BookmarkNode* managed_node = client_->managed_node()->GetChild(0);
+ const BookmarkNode* managed_node = model_->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, model_->managed_node()));
nodes.push_back(user_node);
- EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, client_->managed_node()));
+ EXPECT_FALSE(bookmarks::HasDescendantsOf(nodes, model_->managed_node()));
nodes.push_back(managed_node);
- EXPECT_TRUE(bookmarks::HasDescendantsOf(nodes, client_->managed_node()));
+ EXPECT_TRUE(bookmarks::HasDescendantsOf(nodes, model_->managed_node()));
}
« no previous file with comments | « chrome/browser/bookmarks/chrome_bookmark_client.cc ('k') | chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc » ('j') | components/bookmarks/browser/bookmark_client.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698