Move bookmark_utils into bookmarks namespace.

chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.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/bookmark_manager_private/bookmark_manager_private_api.h"
 
 #include <vector>
 
 #include "base/lazy_instance.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 53 matching lines @@
 
 namespace {
 
 // Returns a single bookmark node from the argument ID.
 // This returns NULL in case of failure.
 const BookmarkNode* GetNodeFromString(BookmarkModel* model,
                                       const std::string& id_string) {
   int64 id;
   if (!base::StringToInt64(id_string, &id))
     return NULL;
-  return GetBookmarkNodeByID(model, id);
+  return bookmarks::GetBookmarkNodeByID(model, id);
 }
 
 // Gets a vector of bookmark nodes from the argument list of IDs.
 // This returns false in the case of failure.
 bool GetNodesFromVector(BookmarkModel* model,
                         const std::vector<std::string>& id_strings,
                         std::vector<const BookmarkNode*>* nodes) {
   if (id_strings.empty())
     return false;
 
@@ skipping 267 matching lines @@
 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 && client->HasDescendantsOfManagedNode(nodes)) {
     error_ = bookmark_keys::kModifyManagedError;
     return false;
   }
-  bookmark_utils::CopyToClipboard(model, nodes, cut);
+  bookmarks::CopyToClipboard(model, nodes, cut);
   return true;
 }
 
 bool BookmarkManagerPrivateCopyFunction::RunOnReady() {
   scoped_ptr<Copy::Params> params(Copy::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
   return CopyOrCut(false, params->id_list);
 }
 
 bool BookmarkManagerPrivateCutFunction::RunOnReady() {
   if (!EditBookmarksEnabled())
     return false;
 
   scoped_ptr<Cut::Params> params(Cut::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
   return CopyOrCut(true, params->id_list);
 }
 
 bool BookmarkManagerPrivatePasteFunction::RunOnReady() {
   if (!EditBookmarksEnabled())
     return false;
 
   scoped_ptr<Paste::Params> params(Paste::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
   const BookmarkNode* parent_node = GetNodeFromString(model, params->parent_id);
   if (!CanBeModified(parent_node))
     return false;
-  bool can_paste = bookmark_utils::CanPasteFromClipboard(model, parent_node);
+  bool can_paste = bookmarks::CanPasteFromClipboard(model, parent_node);
   if (!can_paste)
     return false;
 
   // We want to use the highest index of the selected nodes as a destination.
   std::vector<const BookmarkNode*> nodes;
   // No need to test return value, if we got an empty list, we insert at end.
   if (params->selected_id_list)
     GetNodesFromVector(model, *params->selected_id_list, &nodes);
   int highest_index = -1;  // -1 means insert at end of list.
   for (size_t i = 0; i < nodes.size(); ++i) {
     // + 1 so that we insert after the selection.
     int index = parent_node->GetIndexOf(nodes[i]) + 1;
     if (index > highest_index)
       highest_index = index;
   }
 
-  bookmark_utils::PasteFromClipboard(model, parent_node, highest_index);
+  bookmarks::PasteFromClipboard(model, parent_node, highest_index);
   return true;
 }
 
 bool BookmarkManagerPrivateCanPasteFunction::RunOnReady() {
   if (!EditBookmarksEnabled())
     return false;
 
   scoped_ptr<CanPaste::Params> params(CanPaste::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
   const BookmarkNode* parent_node = GetNodeFromString(model, params->parent_id);
   if (!parent_node) {
     error_ = bookmark_keys::kNoParentError;
     return false;
   }
-  bool can_paste =
-      bookmark_utils::CanPasteFromClipboard(model, parent_node);
+  bool can_paste = bookmarks::CanPasteFromClipboard(model, parent_node);
   SetResult(new base::FundamentalValue(can_paste));
   return true;
 }
 
 bool BookmarkManagerPrivateSortChildrenFunction::RunOnReady() {
   if (!EditBookmarksEnabled())
     return false;
 
   scoped_ptr<SortChildren::Params> params(SortChildren::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
@@ skipping 363 matching lines @@
 
   RedoInfo::Results::Result result;
   result.enabled = undo_manager->redo_count() > 0;
   result.label = base::UTF16ToUTF8(undo_manager->GetRedoLabel());
 
   results_ = RedoInfo::Results::Create(result);
   return true;
 }
 
 }  // namespace extensions