Limit access to ChromeBookmarkClient to bookmarks code

chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc

Index: chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
index 8d0c372cb1de9e77d82b8768240c1694f16f431e..2ae7ee3a84c18bd9bb03712d96da345f120829ea 100644
--- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
+++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
@@ -14,7 +14,6 @@
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_stats.h"
-#include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h"
 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h"
@@ -358,10 +357,9 @@ void BookmarkManagerPrivateDragEventRouter::ClearBookmarkNodeData() {
 bool ClipboardBookmarkManagerFunction::CopyOrCut(bool cut,
     const std::vector<std::string>& id_list) {
   BookmarkModel* model = GetBookmarkModel();
-  ChromeBookmarkClient* client = GetChromeBookmarkClient();
   std::vector<const BookmarkNode*> nodes;
   EXTENSION_FUNCTION_VALIDATE(GetNodesFromVector(model, id_list, &nodes));
-  if (cut && bookmarks::HasDescendantsOf(nodes, client->managed_node())) {
+  if (cut && bookmarks::HasDescendantsOf(nodes, model->managed_node())) {
     error_ = bookmark_keys::kModifyManagedError;
     return false;
   }
@@ -615,9 +613,8 @@ bool BookmarkManagerPrivateGetSubtreeFunction::RunOnReady() {
   EXTENSION_FUNCTION_VALIDATE(params);
 
   const BookmarkNode* node = NULL;
-
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
   if (params->id.empty()) {
-    BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
     node = model->root_node();
   } else {
     node = GetBookmarkNodeFromId(params->id);
@@ -626,11 +623,10 @@ bool BookmarkManagerPrivateGetSubtreeFunction::RunOnReady() {
   }
 
   std::vector<linked_ptr<api::bookmarks::BookmarkTreeNode> > nodes;
-  ChromeBookmarkClient* client = GetChromeBookmarkClient();
   if (params->folders_only)
-    bookmark_api_helpers::AddNodeFoldersOnly(client, node, &nodes, true);
+    bookmark_api_helpers::AddNodeFoldersOnly(model, node, &nodes, true);
   else
-    bookmark_api_helpers::AddNode(client, node, &nodes, true);
+    bookmark_api_helpers::AddNode(model, node, &nodes, true);
   results_ = GetSubtree::Results::Create(nodes);
   return true;
 }
@@ -662,8 +658,7 @@ bool BookmarkManagerPrivateCreateWithMetaInfoFunction::RunOnReady() {
     return false;
 
   scoped_ptr<api::bookmarks::BookmarkTreeNode> result_node(
-      bookmark_api_helpers::GetBookmarkTreeNode(
-          GetChromeBookmarkClient(), node, false, false));
+      bookmark_api_helpers::GetBookmarkTreeNode(model, node, false, false));
   results_ = CreateWithMetaInfo::Results::Create(*result_node);
 
   return true;
@@ -790,13 +785,12 @@ bool BookmarkManagerPrivateRemoveTreesFunction::RunOnReady() {
   EXTENSION_FUNCTION_VALIDATE(params);
 
   BookmarkModel* model = GetBookmarkModel();
-  ChromeBookmarkClient* client = GetChromeBookmarkClient();
   bookmarks::ScopedGroupBookmarkActions group_deletes(model);
   int64 id;
   for (size_t i = 0; i < params->id_list.size(); ++i) {
     if (!GetBookmarkIdAsInt64(params->id_list[i], &id))
       return false;
-    if (!bookmark_api_helpers::RemoveNode(model, client, id, true, &error_))
+    if (!bookmark_api_helpers::RemoveNode(model, id, true, &error_))
       return false;
   }