[Extensions] Convert APIs to use movable types [2]

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 11 matching lines @@
 
 namespace keys = bookmark_api_constants;
 using api::bookmarks::BookmarkTreeNode;
 
 namespace bookmark_api_helpers {
 
 namespace {
 
 void AddNodeHelper(bookmarks::ManagedBookmarkService* managed,
                    const BookmarkNode* node,
-                   std::vector<linked_ptr<BookmarkTreeNode>>* nodes,
+                   std::vector<BookmarkTreeNode>* nodes,
                    bool recurse,
                    bool only_folders) {
-  if (node->IsVisible()) {
-    linked_ptr<BookmarkTreeNode> new_node(
-        GetBookmarkTreeNode(managed, node, recurse, only_folders));
-    nodes->push_back(new_node);
-  }
+  if (node->IsVisible())
+    nodes->push_back(GetBookmarkTreeNode(managed, node, recurse, only_folders));
 }
 
 }  // namespace
 
-BookmarkTreeNode* GetBookmarkTreeNode(
-    bookmarks::ManagedBookmarkService* managed,
-    const BookmarkNode* node,
-    bool recurse,
-    bool only_folders) {
-  BookmarkTreeNode* bookmark_tree_node = new BookmarkTreeNode;
+BookmarkTreeNode GetBookmarkTreeNode(bookmarks::ManagedBookmarkService* managed,
+                                     const BookmarkNode* node,
+                                     bool recurse,
+                                     bool only_folders) {
+  BookmarkTreeNode bookmark_tree_node;
   PopulateBookmarkTreeNode(managed, node, recurse, only_folders,
-                           bookmark_tree_node);
+                           &bookmark_tree_node);
   return bookmark_tree_node;
 }
 
 void PopulateBookmarkTreeNode(
     bookmarks::ManagedBookmarkService* managed,
     const bookmarks::BookmarkNode* node,
     bool recurse,
     bool only_folders,
     api::bookmarks::BookmarkTreeNode* out_bookmark_tree_node) {
   DCHECK(out_bookmark_tree_node);
@@ skipping 25 matching lines @@
         new double(floor(node->date_added().ToDoubleT() * 1000)));
   }
 
   if (bookmarks::IsDescendantOf(node, managed->managed_node()) ||
       bookmarks::IsDescendantOf(node, managed->supervised_node())) {
     out_bookmark_tree_node->unmodifiable =
         api::bookmarks::BOOKMARK_TREE_NODE_UNMODIFIABLE_MANAGED;
   }
 
   if (recurse && node->is_folder()) {
-    std::vector<linked_ptr<BookmarkTreeNode>> children;
+    std::vector<BookmarkTreeNode> children;
     for (int i = 0; i < node->child_count(); ++i) {
       const BookmarkNode* child = node->GetChild(i);
       if (child->IsVisible() && (!only_folders || child->is_folder())) {
-        linked_ptr<BookmarkTreeNode> child_node(
+        children.push_back(
             GetBookmarkTreeNode(managed, child, true, only_folders));
-        children.push_back(child_node);
       }
     }
     out_bookmark_tree_node->children.reset(
-        new std::vector<linked_ptr<BookmarkTreeNode>>(children));
+        new std::vector<BookmarkTreeNode>(std::move(children)));
   }
 }
 
 void AddNode(bookmarks::ManagedBookmarkService* managed,
              const BookmarkNode* node,
-             std::vector<linked_ptr<BookmarkTreeNode>>* nodes,
+             std::vector<BookmarkTreeNode>* nodes,
              bool recurse) {
   return AddNodeHelper(managed, node, nodes, recurse, false);
 }
 
 void AddNodeFoldersOnly(bookmarks::ManagedBookmarkService* managed,
                         const BookmarkNode* node,
-                        std::vector<linked_ptr<BookmarkTreeNode>>* nodes,
+                        std::vector<BookmarkTreeNode>* nodes,
                         bool recurse) {
   return AddNodeHelper(managed, node, nodes, recurse, true);
 }
 
 bool RemoveNode(BookmarkModel* model,
                 bookmarks::ManagedBookmarkService* managed,
                 int64_t id,
                 bool recursive,
                 std::string* error) {
   const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(model, id);
@@ skipping 36 matching lines @@
 
   if (node.is_folder()) {
     for (int i = 0; i < node.child_count(); ++i) {
       GetMetaInfo(*(node.GetChild(i)), id_to_meta_info_map);
     }
   }
 }
 
 }  // namespace bookmark_api_helpers
 }  // namespace extensions