Introduce ChromeBookmarkClientFactory

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h"
 
 #include <math.h>  // For floor()
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
@@ skipping 88 matching lines @@
   return AddNodeHelper(client, node, nodes, recurse, false);
 }
 
 void AddNodeFoldersOnly(ChromeBookmarkClient* client,
                         const BookmarkNode* node,
                         std::vector<linked_ptr<BookmarkTreeNode> >* nodes,
                         bool recurse) {
   return AddNodeHelper(client, node, nodes, recurse, true);
 }
 
-bool RemoveNode(ChromeBookmarkClient* client,
+bool RemoveNode(BookmarkModel* model,
+                ChromeBookmarkClient* client,
                 int64 id,
                 bool recursive,
                 std::string* error) {
-  BookmarkModel* model = client->model();
   const BookmarkNode* node = GetBookmarkNodeByID(model, id);
   if (!node) {
     *error = keys::kNoNodeError;
     return false;
   }
   if (model->is_permanent_node(node)) {
     *error = keys::kModifySpecialError;
     return false;
   }
   if (client->IsDescendantOfManagedNode(node)) {
     *error = keys::kModifyManagedError;
     return false;
   }
   if (node->is_folder() && !node->empty() && !recursive) {
     *error = keys::kFolderNotEmptyError;
     return false;
   }
 
   const BookmarkNode* parent = node->parent();
   model->Remove(parent, parent->GetIndexOf(node));
   return true;
 }
 
 }  // namespace bookmark_api_helpers
 }  // namespace extensions