Convert //components/bookmarks from scoped_ptr to std::unique_ptr

components/bookmarks/browser/bookmark_model.cc

Index: components/bookmarks/browser/bookmark_model.cc
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index 3343af0be6d0d2c71302f66f7b1b9eaa095c6f01..390a2316134f1a15c043f5c7faac2628e34459d4 100644
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -98,7 +98,7 @@ class EmptyUndoDelegate : public BookmarkUndoDelegate {
   void OnBookmarkNodeRemoved(BookmarkModel* model,
                              const BookmarkNode* parent,
                              int index,
-                             scoped_ptr<BookmarkNode> node) override {}
+                             std::unique_ptr<BookmarkNode> node) override {}
 
   DISALLOW_COPY_AND_ASSIGN(EmptyUndoDelegate);
 };
@@ -107,7 +107,7 @@ class EmptyUndoDelegate : public BookmarkUndoDelegate {
 
 // BookmarkModel --------------------------------------------------------------
 
-BookmarkModel::BookmarkModel(scoped_ptr<BookmarkClient> client)
+BookmarkModel::BookmarkModel(std::unique_ptr<BookmarkClient> client)
     : client_(std::move(client)),
       loaded_(false),
       root_(GURL()),
@@ -258,10 +258,8 @@ void BookmarkModel::RemoveAllUserBookmarks() {
   BeginGroupedChanges();
   for (const auto& removed_node_data : removed_node_data_list) {
     undo_delegate()->OnBookmarkNodeRemoved(
-        this,
-        removed_node_data.parent,
-        removed_node_data.index,
-        scoped_ptr<BookmarkNode>(removed_node_data.node));
+        this, removed_node_data.parent, removed_node_data.index,
+        std::unique_ptr<BookmarkNode>(removed_node_data.node));
   }
   EndGroupedChanges();
 }
@@ -658,7 +656,7 @@ void BookmarkModel::SortChildren(const BookmarkNode* parent) {
                     OnWillReorderBookmarkNode(this, parent));
 
   UErrorCode error = U_ZERO_ERROR;
-  scoped_ptr<icu::Collator> collator(icu::Collator::createInstance(error));
+  std::unique_ptr<icu::Collator> collator(icu::Collator::createInstance(error));
   if (U_FAILURE(error))
     collator.reset(NULL);
   BookmarkNode* mutable_parent = AsMutable(parent);
@@ -753,9 +751,10 @@ const BookmarkPermanentNode* BookmarkModel::PermanentNode(
   }
 }
 
-void BookmarkModel::RestoreRemovedNode(const BookmarkNode* parent,
-                                       int index,
-                                       scoped_ptr<BookmarkNode> scoped_node) {
+void BookmarkModel::RestoreRemovedNode(
+    const BookmarkNode* parent,
+    int index,
+    std::unique_ptr<BookmarkNode> scoped_node) {
   BookmarkNode* node = scoped_node.release();
   AddNode(AsMutable(parent), index, node);
 
@@ -798,7 +797,7 @@ void BookmarkModel::RemoveNode(BookmarkNode* node,
     RemoveNode(node->GetChild(i), removed_urls);
 }
 
-void BookmarkModel::DoneLoading(scoped_ptr<BookmarkLoadDetails> details) {
+void BookmarkModel::DoneLoading(std::unique_ptr<BookmarkLoadDetails> details) {
   DCHECK(details);
   if (loaded_) {
     // We should only ever be loaded once.
@@ -890,7 +889,7 @@ void BookmarkModel::DoneLoading(scoped_ptr<BookmarkLoadDetails> details) {
 }
 
 void BookmarkModel::RemoveAndDeleteNode(BookmarkNode* delete_me) {
-  scoped_ptr<BookmarkNode> node(delete_me);
+  std::unique_ptr<BookmarkNode> node(delete_me);
 
   const BookmarkNode* parent = node->parent();
   DCHECK(parent);
@@ -1089,20 +1088,16 @@ int64_t BookmarkModel::generate_next_node_id() {
   return next_node_id_++;
 }
 
-scoped_ptr<BookmarkLoadDetails> BookmarkModel::CreateLoadDetails() {
+std::unique_ptr<BookmarkLoadDetails> BookmarkModel::CreateLoadDetails() {
   BookmarkPermanentNode* bb_node =
       CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
   BookmarkPermanentNode* other_node =
       CreatePermanentNode(BookmarkNode::OTHER_NODE);
   BookmarkPermanentNode* mobile_node =
       CreatePermanentNode(BookmarkNode::MOBILE);
-  return scoped_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails(
-      bb_node,
-      other_node,
-      mobile_node,
-      client_->GetLoadExtraNodesCallback(),
-      new BookmarkIndex(client_.get()),
-      next_node_id_));
+  return std::unique_ptr<BookmarkLoadDetails>(new BookmarkLoadDetails(
+      bb_node, other_node, mobile_node, client_->GetLoadExtraNodesCallback(),
+      new BookmarkIndex(client_.get()), next_node_id_));
 }
 
 void BookmarkModel::SetUndoDelegate(BookmarkUndoDelegate* undo_delegate) {