Limit access to ChromeBookmarkClient to bookmarks code

components/bookmarks/browser/bookmark_utils.cc

Index: components/bookmarks/browser/bookmark_utils.cc
diff --git a/components/bookmarks/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
index e9f32d4b3ee86b05a24d13ac24d525bca352d1d6..833c51b26c88596843e659b44c84244bbee599e9 100644
--- a/components/bookmarks/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -313,7 +313,7 @@ void PasteFromClipboard(BookmarkModel* model,
 }
 
 bool CanPasteFromClipboard(BookmarkModel* model, const BookmarkNode* node) {
-  if (!node || !model->client()->CanBeEditedByUser(node))
+  if (!node || !model->CanBeEditedByUser(node))
     return false;
   return (BookmarkNodeData::ClipboardContainsBookmarks() ||
           GetUrlFromClipboard().is_valid());
@@ -328,7 +328,7 @@ std::vector<const BookmarkNode*> GetMostRecentlyModifiedUserFolders(
 
   while (iterator.has_next()) {
     const BookmarkNode* parent = iterator.Next();
-    if (!model->client()->CanBeEditedByUser(parent))
+    if (!model->CanBeEditedByUser(parent))
       continue;
     if (parent->is_folder() && parent->date_folder_modified() > Time()) {
       if (max_count == 0) {
@@ -354,7 +354,7 @@ std::vector<const BookmarkNode*> GetMostRecentlyModifiedUserFolders(
 
     for (int i = 0; i < root_node->child_count(); ++i) {
       const BookmarkNode* node = root_node->GetChild(i);
-      if (node->IsVisible() && model->client()->CanBeEditedByUser(node) &&
+      if (node->IsVisible() && model->CanBeEditedByUser(node) &&
           std::find(nodes.begin(), nodes.end(), node) == nodes.end()) {
         nodes.push_back(node);
 
@@ -481,7 +481,7 @@ void AddIfNotBookmarked(BookmarkModel* model,
                         const base::string16& title) {
   if (IsBookmarkedByUser(model, url))
     return;  // Nothing to do, a user bookmark with that url already exists.
-  model->client()->RecordAction(base::UserMetricsAction("BookmarkAdded"));
+  model->RecordAction(base::UserMetricsAction("BookmarkAdded"));
   const BookmarkNode* parent = model->GetParentForNewNodes();
   model->AddURL(parent, parent->child_count(), title, url);
 }
@@ -494,7 +494,7 @@ void RemoveAllBookmarks(BookmarkModel* model, const GURL& url) {
   for (size_t i = 0; i < bookmarks.size(); ++i) {
     const BookmarkNode* node = bookmarks[i];
     int index = node->parent()->GetIndexOf(node);
-    if (index > -1 && model->client()->CanBeEditedByUser(node))
+    if (index > -1 && model->CanBeEditedByUser(node))
       model->Remove(node);
   }
 }
@@ -515,10 +515,10 @@ base::string16 CleanUpTitleForMatching(const base::string16& title) {
   return base::i18n::ToLower(title.substr(0u, kCleanedUpTitleMaxLength));
 }
 
-bool CanAllBeEditedByUser(BookmarkClient* client,
+bool CanAllBeEditedByUser(BookmarkModel* model,
                           const std::vector<const BookmarkNode*>& nodes) {
   for (size_t i = 0; i < nodes.size(); ++i) {
-    if (!client->CanBeEditedByUser(nodes[i]))
+    if (!model->CanBeEditedByUser(nodes[i]))
       return false;
   }
   return true;
@@ -528,7 +528,7 @@ bool IsBookmarkedByUser(BookmarkModel* model, const GURL& url) {
   std::vector<const BookmarkNode*> nodes;
   model->GetNodesByURL(url, &nodes);
   for (size_t i = 0; i < nodes.size(); ++i) {
-    if (model->client()->CanBeEditedByUser(nodes[i]))
+    if (model->CanBeEditedByUser(nodes[i]))
       return true;
   }
   return false;