Limit access to ChromeBookmarkClient to bookmarks code

chrome/browser/sync/test/integration/bookmarks_helper.cc

Index: chrome/browser/sync/test/integration/bookmarks_helper.cc
diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
index 63840735afba8efc6bb79eecd7d2a79a0bee0755..f10d6350ac12bbe581eb5134d184d77f616a6b43 100644
--- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
+++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
@@ -20,8 +20,6 @@
 #include "base/synchronization/waitable_event.h"
 #include "base/task/cancelable_task_tracker.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/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ -381,10 +379,10 @@ bool NodesMatch(const BookmarkNode* node_a, const BookmarkNode* node_b) {
 }
 
 // Helper for BookmarkModelsMatch.
-bool NodeCantBeSynced(bookmarks::BookmarkClient* client,
+bool NodeCantBeSynced(bookmarks::BookmarkModel* model,
                       const BookmarkNode* node) {
   // Return true to skip a node.
-  return !client->CanSyncNode(node);
+  return !model->CanSyncNode(node);
 }
 
 // Checks if the hierarchies in |model_a| and |model_b| are equivalent in
@@ -393,9 +391,9 @@ bool NodeCantBeSynced(bookmarks::BookmarkClient* client,
 bool BookmarkModelsMatch(BookmarkModel* model_a, BookmarkModel* model_b) {
   bool ret_val = true;
   ui::TreeNodeIterator<const BookmarkNode> iterator_a(
-      model_a->root_node(), base::Bind(&NodeCantBeSynced, model_a->client()));
+      model_a->root_node(), base::Bind(&NodeCantBeSynced, model_a));
   ui::TreeNodeIterator<const BookmarkNode> iterator_b(
-      model_b->root_node(), base::Bind(&NodeCantBeSynced, model_b->client()));
+      model_b->root_node(), base::Bind(&NodeCantBeSynced, model_b));
   while (iterator_a.has_next()) {
     const BookmarkNode* node_a = iterator_a.Next();
     if (!iterator_b.has_next()) {
@@ -463,8 +461,8 @@ const BookmarkNode* GetSyncedBookmarksNode(int index) {
 }
 
 const BookmarkNode* GetManagedNode(int index) {
-  return ChromeBookmarkClientFactory::GetForProfile(
-      sync_datatype_helper::test()->GetProfile(index))->managed_node();
+  return BookmarkModelFactory::GetForProfile(
+             sync_datatype_helper::test()->GetProfile(index))->managed_node();
 }
 
 BookmarkModel* GetVerifierBookmarkModel() {