Fix object ownership in ui/base/models.

components/bookmarks/browser/bookmark_model.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 336 matching lines @@
   // This does NOT delete the node.
   void RemoveNode(BookmarkNode* node, std::set<GURL>* removed_urls);
 
   // Invoked when loading is finished. Sets |loaded_| and notifies observers.
   // BookmarkModel takes ownership of |details|.
   void DoneLoading(std::unique_ptr<BookmarkLoadDetails> details);
 
   // Populates |nodes_ordered_by_url_set_| from root.
   void PopulateNodesByURL(BookmarkNode* node);
 
-  // Removes the node from its parent, but does not delete it. No notifications
+  // Removes the node from its parent and returns it. No notifications
   // are sent. |removed_urls| is populated with the urls which no longer have
   // any bookmarks associated with them.
   // This method should be called after acquiring |url_lock_|.
-  void RemoveNodeAndGetRemovedUrls(BookmarkNode* node,
-                                   std::set<GURL>* removed_urls);
+  std::unique_ptr<BookmarkNode> RemoveNodeAndGetRemovedUrls(
+      BookmarkNode* node,
+      std::set<GURL>* removed_urls);
 
   // Removes the node from its parent, sends notification, and deletes it.
   // type specifies how the node should be removed.
   void RemoveAndDeleteNode(BookmarkNode* delete_me);
 
   // Remove |node| from |nodes_ordered_by_url_set_| and |index_|.
   void RemoveNodeFromInternalMaps(BookmarkNode* node);
 
   // Adds the |node| at |parent| in the specified |index| and notifies its
   // observers.
   BookmarkNode* AddNode(BookmarkNode* parent,
                         int index,
-                        BookmarkNode* node);
+                        std::unique_ptr<BookmarkNode> node);
 
   // Adds the |node| to |nodes_ordered_by_url_set_| and |index_|.
   void AddNodeToInternalMaps(BookmarkNode* node);
 
   // Returns true if the parent and index are valid.
   bool IsValidIndex(const BookmarkNode* parent, int index, bool allow_end);
 
   // Creates one of the possible permanent nodes (bookmark bar node, other node
   // and mobile node) from |type|.
   BookmarkPermanentNode* CreatePermanentNode(BookmarkNode::Type type);
@@ skipping 80 matching lines @@
 
   BookmarkUndoDelegate* undo_delegate_;
   std::unique_ptr<BookmarkUndoDelegate> empty_undo_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
 }  // namespace bookmarks
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_