Limit access to ChromeBookmarkClient to bookmarks code

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

Index: chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
index 2e08bda3614535aa7fe3b05b35f42faccf96a21e..3e0a0bdeaa41a889878aab539c8c323d4168e158 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -21,8 +21,6 @@
 #include "base/time/time.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.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/browser/extensions/api/bookmarks/bookmark_api_helpers.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
@@ -109,10 +107,6 @@ BookmarkModel* BookmarksFunction::GetBookmarkModel() {
   return BookmarkModelFactory::GetForProfile(GetProfile());
 }
 
-ChromeBookmarkClient* BookmarksFunction::GetChromeBookmarkClient() {
-  return ChromeBookmarkClientFactory::GetForProfile(GetProfile());
-}
-
 bool BookmarksFunction::GetBookmarkIdAsInt64(const std::string& id_string,
                                              int64* id) {
   if (base::StringToInt64(id_string, id))
@@ -210,9 +204,9 @@ bool BookmarksFunction::CanBeModified(const BookmarkNode* node) {
     error_ = keys::kModifySpecialError;
     return false;
   }
-  ChromeBookmarkClient* client = GetChromeBookmarkClient();
-  if (::bookmarks::IsDescendantOf(node, client->managed_node()) ||
-      ::bookmarks::IsDescendantOf(node, client->supervised_node())) {
+  BookmarkModel* model = GetBookmarkModel();
+  if (::bookmarks::IsDescendantOf(node, model->managed_node()) ||
+      ::bookmarks::IsDescendantOf(node, model->supervised_node())) {
     error_ = keys::kModifyManagedError;
     return false;
   }
@@ -242,8 +236,7 @@ void BookmarksFunction::RunAndSendResponse() {
 
 BookmarkEventRouter::BookmarkEventRouter(Profile* profile)
     : browser_context_(profile),
-      model_(BookmarkModelFactory::GetForProfile(profile)),
-      client_(ChromeBookmarkClientFactory::GetForProfile(profile)) {
+      model_(BookmarkModelFactory::GetForProfile(profile)) {
   model_->AddObserver(this);
 }
 
@@ -295,7 +288,7 @@ void BookmarkEventRouter::BookmarkNodeAdded(BookmarkModel* model,
                                             int index) {
   const BookmarkNode* node = parent->GetChild(index);
   scoped_ptr<BookmarkTreeNode> tree_node(
-      bookmark_api_helpers::GetBookmarkTreeNode(client_, node, false, false));
+      bookmark_api_helpers::GetBookmarkTreeNode(model_, node, false, false));
   DispatchEvent(bookmarks::OnCreated::kEventName,
                 bookmarks::OnCreated::Create(base::Int64ToString(node->id()),
                                              *tree_node));
@@ -414,7 +407,7 @@ bool BookmarksGetFunction::RunOnReady() {
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   std::vector<linked_ptr<BookmarkTreeNode> > nodes;
-  ChromeBookmarkClient* client = GetChromeBookmarkClient();
+  BookmarkModel* model = GetBookmarkModel();
   if (params->id_or_id_list.as_strings) {
     std::vector<std::string>& ids = *params->id_or_id_list.as_strings;
     size_t count = ids.size();
@@ -423,14 +416,14 @@ bool BookmarksGetFunction::RunOnReady() {
       const BookmarkNode* node = GetBookmarkNodeFromId(ids[i]);
       if (!node)
         return false;
-      bookmark_api_helpers::AddNode(client, node, &nodes, false);
+      bookmark_api_helpers::AddNode(model, node, &nodes, false);
     }
   } else {
     const BookmarkNode* node =
         GetBookmarkNodeFromId(*params->id_or_id_list.as_string);
     if (!node)
       return false;
-    bookmark_api_helpers::AddNode(client, node, &nodes, false);
+    bookmark_api_helpers::AddNode(model, node, &nodes, false);
   }
 
   results_ = bookmarks::Get::Results::Create(nodes);
@@ -450,8 +443,7 @@ bool BookmarksGetChildrenFunction::RunOnReady() {
   int child_count = node->child_count();
   for (int i = 0; i < child_count; ++i) {
     const BookmarkNode* child = node->GetChild(i);
-    bookmark_api_helpers::AddNode(
-        GetChromeBookmarkClient(), child, &nodes, false);
+    bookmark_api_helpers::AddNode(GetBookmarkModel(), child, &nodes, false);
   }
 
   results_ = bookmarks::GetChildren::Results::Create(nodes);
@@ -475,8 +467,7 @@ bool BookmarksGetRecentFunction::RunOnReady() {
   std::vector<const BookmarkNode*>::iterator i = nodes.begin();
   for (; i != nodes.end(); ++i) {
     const BookmarkNode* node = *i;
-    bookmark_api_helpers::AddNode(
-        GetChromeBookmarkClient(), node, &tree_nodes, false);
+    bookmark_api_helpers::AddNode(GetBookmarkModel(), node, &tree_nodes, false);
   }
 
   results_ = bookmarks::GetRecent::Results::Create(tree_nodes);
@@ -487,7 +478,7 @@ bool BookmarksGetTreeFunction::RunOnReady() {
   std::vector<linked_ptr<BookmarkTreeNode> > nodes;
   const BookmarkNode* node =
       BookmarkModelFactory::GetForProfile(GetProfile())->root_node();
-  bookmark_api_helpers::AddNode(GetChromeBookmarkClient(), node, &nodes, true);
+  bookmark_api_helpers::AddNode(GetBookmarkModel(), node, &nodes, true);
   results_ = bookmarks::GetTree::Results::Create(nodes);
   return true;
 }
@@ -502,7 +493,7 @@ bool BookmarksGetSubTreeFunction::RunOnReady() {
     return false;
 
   std::vector<linked_ptr<BookmarkTreeNode> > nodes;
-  bookmark_api_helpers::AddNode(GetChromeBookmarkClient(), node, &nodes, true);
+  bookmark_api_helpers::AddNode(GetBookmarkModel(), node, &nodes, true);
   results_ = bookmarks::GetSubTree::Results::Create(nodes);
   return true;
 }
@@ -547,10 +538,10 @@ bool BookmarksSearchFunction::RunOnReady() {
   }
 
   std::vector<linked_ptr<BookmarkTreeNode> > tree_nodes;
-  ChromeBookmarkClient* client = GetChromeBookmarkClient();
+  BookmarkModel* model = GetBookmarkModel();
   for (std::vector<const BookmarkNode*>::iterator node_iter = nodes.begin();
        node_iter != nodes.end(); ++node_iter) {
-    bookmark_api_helpers::AddNode(client, *node_iter, &tree_nodes, false);
+    bookmark_api_helpers::AddNode(model, *node_iter, &tree_nodes, false);
   }
 
   results_ = bookmarks::Search::Results::Create(tree_nodes);
@@ -589,8 +580,7 @@ bool BookmarksRemoveFunction::RunOnReady() {
     recursive = true;
 
   BookmarkModel* model = GetBookmarkModel();
-  ChromeBookmarkClient* client = GetChromeBookmarkClient();
-  if (!bookmark_api_helpers::RemoveNode(model, client, id, recursive, &error_))
+  if (!bookmark_api_helpers::RemoveNode(model, id, recursive, &error_))
     return false;
 
   return true;
@@ -609,8 +599,8 @@ bool BookmarksCreateFunction::RunOnReady() {
   if (!node)
     return false;
 
-  scoped_ptr<BookmarkTreeNode> ret(bookmark_api_helpers::GetBookmarkTreeNode(
-      GetChromeBookmarkClient(), node, false, false));
+  scoped_ptr<BookmarkTreeNode> ret(
+      bookmark_api_helpers::GetBookmarkTreeNode(model, node, false, false));
   results_ = bookmarks::Create::Results::Create(*ret);
 
   return true;
@@ -670,8 +660,7 @@ bool BookmarksMoveFunction::RunOnReady() {
   model->Move(node, parent, index);
 
   scoped_ptr<BookmarkTreeNode> tree_node(
-      bookmark_api_helpers::GetBookmarkTreeNode(
-          GetChromeBookmarkClient(), node, false, false));
+      bookmark_api_helpers::GetBookmarkTreeNode(model, node, false, false));
   results_ = bookmarks::Move::Results::Create(*tree_node);
 
   return true;
@@ -726,8 +715,7 @@ bool BookmarksUpdateFunction::RunOnReady() {
     model->SetURL(node, url);
 
   scoped_ptr<BookmarkTreeNode> tree_node(
-      bookmark_api_helpers::GetBookmarkTreeNode(
-          GetChromeBookmarkClient(), node, false, false));
+      bookmark_api_helpers::GetBookmarkTreeNode(model, node, false, false));
   results_ = bookmarks::Update::Results::Create(*tree_node);
   return true;
 }