Limit access to ChromeBookmarkClient to bookmarks code

chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc

Index: chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
index bca84deaedc4329b310bc6eb2a3bea43a624b0fd..6e656c8049d978929ef37a5520f32d604a4fac79 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_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/browser/extensions/api/bookmarks/bookmark_api_constants.h"
 #include "chrome/common/extensions/api/bookmarks.h"
 #include "chrome/test/base/testing_profile.h"
@@ -32,12 +30,11 @@ namespace bookmark_api_helpers {
 class ExtensionBookmarksTest : public testing::Test {
  public:
   ExtensionBookmarksTest()
-      : client_(NULL), model_(NULL), node_(NULL), node2_(NULL), folder_(NULL) {}
+      : model_(NULL), node_(NULL), node2_(NULL), folder_(NULL) {}
 
   void SetUp() override {
     profile_.CreateBookmarkModel(false);
     model_ = BookmarkModelFactory::GetForProfile(&profile_);
-    client_ = ChromeBookmarkClientFactory::GetForProfile(&profile_);
     bookmarks::test::WaitForBookmarkModelToLoad(model_);
 
     node_ = model_->AddURL(model_->other_node(), 0, base::ASCIIToUTF16("Digg"),
@@ -60,7 +57,6 @@ class ExtensionBookmarksTest : public testing::Test {
 
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
-  ChromeBookmarkClient* client_;
   BookmarkModel* model_;
   const BookmarkNode* node_;
   const BookmarkNode* node2_;
@@ -69,7 +65,7 @@ class ExtensionBookmarksTest : public testing::Test {
 
 TEST_F(ExtensionBookmarksTest, GetFullTreeFromRoot) {
   scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(client_,
+      GetBookmarkTreeNode(model_,
                           model_->other_node(),
                           true,    // Recurse.
                           false));  // Not only folders.
@@ -78,7 +74,7 @@ TEST_F(ExtensionBookmarksTest, GetFullTreeFromRoot) {
 
 TEST_F(ExtensionBookmarksTest, GetFoldersOnlyFromRoot) {
   scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(client_,
+      GetBookmarkTreeNode(model_,
                           model_->other_node(),
                           true,   // Recurse.
                           true));  // Only folders.
@@ -87,9 +83,9 @@ TEST_F(ExtensionBookmarksTest, GetFoldersOnlyFromRoot) {
 
 TEST_F(ExtensionBookmarksTest, GetSubtree) {
   scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(client_,
+      GetBookmarkTreeNode(model_,
                           folder_,
-                          true,    // Recurse.
+                          true,     // Recurse.
                           false));  // Not only folders.
   ASSERT_EQ(4U, tree->children->size());
   linked_ptr<BookmarkTreeNode> digg = tree->children->at(1);
@@ -99,7 +95,7 @@ TEST_F(ExtensionBookmarksTest, GetSubtree) {
 
 TEST_F(ExtensionBookmarksTest, GetSubtreeFoldersOnly) {
   scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(client_,
+      GetBookmarkTreeNode(model_,
                           folder_,
                           true,   // Recurse.
                           true));  // Only folders.
@@ -111,7 +107,7 @@ TEST_F(ExtensionBookmarksTest, GetSubtreeFoldersOnly) {
 
 TEST_F(ExtensionBookmarksTest, GetModifiableNode) {
   scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(client_,
+      GetBookmarkTreeNode(model_,
                           node_,
                           false,    // Recurse.
                           false));  // Only folders.
@@ -124,12 +120,12 @@ TEST_F(ExtensionBookmarksTest, GetModifiableNode) {
 
 TEST_F(ExtensionBookmarksTest, GetManagedNode) {
   const BookmarkNode* managed_bookmark =
-      model_->AddURL(client_->managed_node(),
+      model_->AddURL(model_->managed_node(),
                      0,
                      base::ASCIIToUTF16("Chromium"),
                      GURL("http://www.chromium.org/"));
   scoped_ptr<BookmarkTreeNode> tree(
-      GetBookmarkTreeNode(client_,
+      GetBookmarkTreeNode(model_,
                           managed_bookmark,
                           false,    // Recurse.
                           false));  // Only folders.
@@ -142,39 +138,37 @@ TEST_F(ExtensionBookmarksTest, GetManagedNode) {
 TEST_F(ExtensionBookmarksTest, RemoveNodeInvalidId) {
   int64 invalid_id = model_->next_node_id();
   std::string error;
-  EXPECT_FALSE(RemoveNode(model_, client_, invalid_id, true, &error));
+  EXPECT_FALSE(RemoveNode(model_, invalid_id, true, &error));
   EXPECT_EQ(keys::kNoNodeError, error);
 }
 
 TEST_F(ExtensionBookmarksTest, RemoveNodePermanent) {
   std::string error;
-  EXPECT_FALSE(
-      RemoveNode(model_, client_, model_->other_node()->id(), true, &error));
+  EXPECT_FALSE(RemoveNode(model_, model_->other_node()->id(), true, &error));
   EXPECT_EQ(keys::kModifySpecialError, error);
 }
 
 TEST_F(ExtensionBookmarksTest, RemoveNodeManaged) {
   const BookmarkNode* managed_bookmark =
-      model_->AddURL(client_->managed_node(),
+      model_->AddURL(model_->managed_node(),
                      0,
                      base::ASCIIToUTF16("Chromium"),
                      GURL("http://www.chromium.org"));
   std::string error;
-  EXPECT_FALSE(
-      RemoveNode(model_, client_, managed_bookmark->id(), true, &error));
+  EXPECT_FALSE(RemoveNode(model_, managed_bookmark->id(), true, &error));
   EXPECT_EQ(keys::kModifyManagedError, error);
 }
 
 TEST_F(ExtensionBookmarksTest, RemoveNodeNotRecursive) {
   std::string error;
-  EXPECT_FALSE(RemoveNode(model_, client_, folder_->id(), false, &error));
+  EXPECT_FALSE(RemoveNode(model_, folder_->id(), false, &error));
   EXPECT_EQ(keys::kFolderNotEmptyError, error);
 }
 
 TEST_F(ExtensionBookmarksTest, RemoveNodeRecursive) {
   EXPECT_EQ(3, model_->other_node()->child_count());
   std::string error;
-  EXPECT_TRUE(RemoveNode(model_, client_, folder_->id(), true, &error));
+  EXPECT_TRUE(RemoveNode(model_, folder_->id(), true, &error));
   EXPECT_EQ(2, model_->other_node()->child_count());
 }