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

chrome/browser/extensions/api/bookmarks/bookmarks_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/bookmarks/bookmarks_api.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 278 matching lines @@
 
   DispatchEvent(
       events::BOOKMARKS_ON_MOVED, bookmarks::OnMoved::kEventName,
       bookmarks::OnMoved::Create(base::Int64ToString(node->id()), move_info));
 }
 
 void BookmarkEventRouter::BookmarkNodeAdded(BookmarkModel* model,
                                             const BookmarkNode* parent,
                                             int index) {
   const BookmarkNode* node = parent->GetChild(index);
-  scoped_ptr<BookmarkTreeNode> tree_node(
-      bookmark_api_helpers::GetBookmarkTreeNode(managed_, node, false, false));
-  DispatchEvent(events::BOOKMARKS_ON_CREATED, bookmarks::OnCreated::kEventName,
-                bookmarks::OnCreated::Create(base::Int64ToString(node->id()),
-                                             *tree_node));
+  BookmarkTreeNode tree_node =
+      bookmark_api_helpers::GetBookmarkTreeNode(managed_, node, false, false);
+  DispatchEvent(
+      events::BOOKMARKS_ON_CREATED, bookmarks::OnCreated::kEventName,
+      bookmarks::OnCreated::Create(base::Int64ToString(node->id()), tree_node));
 }
 
 void BookmarkEventRouter::BookmarkNodeRemoved(
     BookmarkModel* model,
     const BookmarkNode* parent,
     int index,
     const BookmarkNode* node,
     const std::set<GURL>& removed_urls) {
   bookmarks::OnRemoved::RemoveInfo remove_info;
   remove_info.parent_id = base::Int64ToString(parent->id());
@@ skipping 99 matching lines @@
   bookmark_event_router_.reset(
       new BookmarkEventRouter(Profile::FromBrowserContext(browser_context_)));
   EventRouter::Get(browser_context_)->UnregisterObserver(this);
 }
 
 bool BookmarksGetFunction::RunOnReady() {
   scoped_ptr<bookmarks::Get::Params> params(
       bookmarks::Get::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
-  std::vector<linked_ptr<BookmarkTreeNode> > nodes;
+  std::vector<BookmarkTreeNode> nodes;
   ManagedBookmarkService* managed = GetManagedBookmarkService();
   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();
     EXTENSION_FUNCTION_VALIDATE(count > 0);
     for (size_t i = 0; i < count; ++i) {
       const BookmarkNode* node = GetBookmarkNodeFromId(ids[i]);
       if (!node)
         return false;
       bookmark_api_helpers::AddNode(managed, node, &nodes, false);
@@ skipping 12 matching lines @@
 
 bool BookmarksGetChildrenFunction::RunOnReady() {
   scoped_ptr<bookmarks::GetChildren::Params> params(
       bookmarks::GetChildren::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   const BookmarkNode* node = GetBookmarkNodeFromId(params->id);
   if (!node)
     return false;
 
-  std::vector<linked_ptr<BookmarkTreeNode> > nodes;
+  std::vector<BookmarkTreeNode> nodes;
   int child_count = node->child_count();
   for (int i = 0; i < child_count; ++i) {
     const BookmarkNode* child = node->GetChild(i);
     bookmark_api_helpers::AddNode(GetManagedBookmarkService(), child, &nodes,
                                   false);
   }
 
   results_ = bookmarks::GetChildren::Results::Create(nodes);
   return true;
 }
 
 bool BookmarksGetRecentFunction::RunOnReady() {
   scoped_ptr<bookmarks::GetRecent::Params> params(
       bookmarks::GetRecent::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   if (params->number_of_items < 1)
     return false;
 
   std::vector<const BookmarkNode*> nodes;
   ::bookmarks::GetMostRecentlyAddedEntries(
       BookmarkModelFactory::GetForProfile(GetProfile()),
       params->number_of_items,
       &nodes);
 
-  std::vector<linked_ptr<BookmarkTreeNode> > tree_nodes;
-  std::vector<const BookmarkNode*>::iterator i = nodes.begin();
-  for (; i != nodes.end(); ++i) {
-    const BookmarkNode* node = *i;
+  std::vector<BookmarkTreeNode> tree_nodes;
+  for (const BookmarkNode* node : nodes) {
     bookmark_api_helpers::AddNode(GetManagedBookmarkService(), node,
                                   &tree_nodes, false);
   }
 
   results_ = bookmarks::GetRecent::Results::Create(tree_nodes);
   return true;
 }
 
 bool BookmarksGetTreeFunction::RunOnReady() {
-  std::vector<linked_ptr<BookmarkTreeNode> > nodes;
+  std::vector<BookmarkTreeNode> nodes;
   const BookmarkNode* node =
       BookmarkModelFactory::GetForProfile(GetProfile())->root_node();
   bookmark_api_helpers::AddNode(GetManagedBookmarkService(), node, &nodes,
                                 true);
   results_ = bookmarks::GetTree::Results::Create(nodes);
   return true;
 }
 
 bool BookmarksGetSubTreeFunction::RunOnReady() {
   scoped_ptr<bookmarks::GetSubTree::Params> params(
       bookmarks::GetSubTree::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   const BookmarkNode* node = GetBookmarkNodeFromId(params->id);
   if (!node)
     return false;
 
-  std::vector<linked_ptr<BookmarkTreeNode> > nodes;
+  std::vector<BookmarkTreeNode> nodes;
   bookmark_api_helpers::AddNode(GetManagedBookmarkService(), node, &nodes,
                                 true);
   results_ = bookmarks::GetSubTree::Results::Create(nodes);
   return true;
 }
 
 bool BookmarksSearchFunction::RunOnReady() {
   scoped_ptr<bookmarks::Search::Params> params(
       bookmarks::Search::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
@@ skipping 25 matching lines @@
     if (object.title)
       query.title.reset(new base::string16(base::UTF8ToUTF16(*object.title)));
     ::bookmarks::GetBookmarksMatchingProperties(
         BookmarkModelFactory::GetForProfile(GetProfile()),
         query,
         std::numeric_limits<int>::max(),
         lang,
         &nodes);
   }
 
-  std::vector<linked_ptr<BookmarkTreeNode> > tree_nodes;
+  std::vector<BookmarkTreeNode> tree_nodes;
   ManagedBookmarkService* managed = GetManagedBookmarkService();
-  for (std::vector<const BookmarkNode*>::iterator node_iter = nodes.begin();
-       node_iter != nodes.end(); ++node_iter) {
-    bookmark_api_helpers::AddNode(managed, *node_iter, &tree_nodes, false);
-  }
+  for (const BookmarkNode* node : nodes)
+    bookmark_api_helpers::AddNode(managed, node, &tree_nodes, false);
 
   results_ = bookmarks::Search::Results::Create(tree_nodes);
   return true;
 }
 
 // static
 bool BookmarksRemoveFunction::ExtractIds(const base::ListValue* args,
                                          std::list<int64_t>* ids,
                                          bool* invalid_id) {
   std::string id_string;
@@ skipping 37 matching lines @@
 
   scoped_ptr<bookmarks::Create::Params> params(
       bookmarks::Create::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
   const BookmarkNode* node = CreateBookmarkNode(model, params->bookmark, NULL);
   if (!node)
     return false;
 
-  scoped_ptr<BookmarkTreeNode> ret(bookmark_api_helpers::GetBookmarkTreeNode(
-      GetManagedBookmarkService(), node, false, false));
-  results_ = bookmarks::Create::Results::Create(*ret);
+  BookmarkTreeNode ret = bookmark_api_helpers::GetBookmarkTreeNode(
+      GetManagedBookmarkService(), node, false, false);
+  results_ = bookmarks::Create::Results::Create(ret);
 
   return true;
 }
 
 // static
 bool BookmarksMoveFunction::ExtractIds(const base::ListValue* args,
                                        std::list<int64_t>* ids,
                                        bool* invalid_id) {
   // For now, Move accepts ID parameters in the same way as an Update.
   return BookmarksUpdateFunction::ExtractIds(args, ids, invalid_id);
@@ skipping 37 matching lines @@
     if (index > parent->child_count() || index < 0) {
       error_ = keys::kInvalidIndexError;
       return false;
     }
   } else {
     index = parent->child_count();
   }
 
   model->Move(node, parent, index);
 
-  scoped_ptr<BookmarkTreeNode> tree_node(
-      bookmark_api_helpers::GetBookmarkTreeNode(GetManagedBookmarkService(),
-                                                node, false, false));
-  results_ = bookmarks::Move::Results::Create(*tree_node);
+  BookmarkTreeNode tree_node = bookmark_api_helpers::GetBookmarkTreeNode(
+      GetManagedBookmarkService(), node, false, false);
+  results_ = bookmarks::Move::Results::Create(tree_node);
 
   return true;
 }
 
 // static
 bool BookmarksUpdateFunction::ExtractIds(const base::ListValue* args,
                                          std::list<int64_t>* ids,
                                          bool* invalid_id) {
   // For now, Update accepts ID parameters in the same way as an Remove.
   return BookmarksRemoveFunction::ExtractIds(args, ids, invalid_id);
@@ skipping 32 matching lines @@
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(GetProfile());
   if (model->is_permanent_node(node)) {
     error_ = keys::kModifySpecialError;
     return false;
   }
   if (has_title)
     model->SetTitle(node, title);
   if (!url.is_empty())
     model->SetURL(node, url);
 
-  scoped_ptr<BookmarkTreeNode> tree_node(
-      bookmark_api_helpers::GetBookmarkTreeNode(GetManagedBookmarkService(),
-                                                node, false, false));
-  results_ = bookmarks::Update::Results::Create(*tree_node);
+  BookmarkTreeNode tree_node = bookmark_api_helpers::GetBookmarkTreeNode(
+      GetManagedBookmarkService(), node, false, false);
+  results_ = bookmarks::Update::Results::Create(tree_node);
   return true;
 }
 
 BookmarksIOFunction::BookmarksIOFunction() {}
 
 BookmarksIOFunction::~BookmarksIOFunction() {
   // There may be pending file dialogs, we need to tell them that we've gone
   // away so they don't try and call back to us.
   if (select_file_dialog_.get())
     select_file_dialog_->ListenerDestroyed();
@@ skipping 96 matching lines @@
 }
 
 void BookmarksExportFunction::FileSelected(const base::FilePath& path,
                                            int index,
                                            void* params) {
   bookmark_html_writer::WriteBookmarks(GetProfile(), path, NULL);
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }
 
 }  // namespace extensions