Fix object ownership in ui/base/models.

chrome/browser/ui/views/bookmarks/bookmark_editor_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_
 
 #include <stdint.h>
 
+#include <memory>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/bookmarks/bookmark_editor.h"
 #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
 #include "components/bookmarks/browser/bookmark_model_observer.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/models/tree_node_model.h"
@@ skipping 35 matching lines @@
                            public ui::SimpleMenuModel::Delegate,
                            public bookmarks::BookmarkModelObserver {
  public:
   // Type of node in the tree. Public purely for testing.
   typedef ui::TreeNodeWithValue<int64_t> EditorNode;
 
   // Model for the TreeView. Trivial subclass that doesn't allow titles with
   // empty strings. Public purely for testing.
   class EditorTreeModel : public ui::TreeNodeModel<EditorNode> {
    public:
-    explicit EditorTreeModel(EditorNode* root)
-        : ui::TreeNodeModel<EditorNode>(root) {}
+    explicit EditorTreeModel(std::unique_ptr<EditorNode> root)
+        : ui::TreeNodeModel<EditorNode>(std::move(root)) {}
 
     void SetTitle(ui::TreeModelNode* node,
                   const base::string16& title) override;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(EditorTreeModel);
   };
 
   BookmarkEditorView(Profile* profile,
                      const bookmarks::BookmarkNode* parent,
@@ skipping 85 matching lines @@
   // Resets the model of the tree and updates the various buttons appropriately.
   void Reset();
 
   // Expands all the nodes in the tree and selects the parent node of the
   // url we're editing or the most recent parent if the url being editted isn't
   // starred.
   void ExpandAndSelect();
 
   // Creates a returns the new root node. This invokes CreateNodes to do
   // the real work.
-  EditorNode* CreateRootNode();
+  std::unique_ptr<EditorNode> CreateRootNode();
 
   // Adds and creates a child node in b_node for all children of bb_node that
   // are folders.
   void CreateNodes(const bookmarks::BookmarkNode* bb_node, EditorNode* b_node);
 
   // Returns the node with the specified id, or NULL if one can't be found.
   EditorNode* FindNodeWithID(BookmarkEditorView::EditorNode* node, int64_t id);
 
   // Invokes ApplyEdits with the selected node.
   void ApplyEdits();
@@ skipping 19 matching lines @@
 
   // Returns the current url the user has input.
   GURL GetInputURL() const;
 
   // Invoked when the url or title has possibly changed. Updates the background
   // of Textfields and ok button appropriately.
   void UserInputChanged();
 
   // Creates a new folder as a child of the selected node. If no node is
   // selected, the new folder is added as a child of the bookmark node. Starts
-  // editing on the new gorup as well.
+  // editing on the new group as well.
   void NewFolder();
 
   // Creates a new EditorNode as the last child of parent. The new node is
   // added to the model and returned. This does NOT start editing. This is used
   // internally by NewFolder and broken into a separate method for testing.
   EditorNode* AddNewFolder(EditorNode* parent);
 
   // If |editor_node| is expanded it's added to |expanded_nodes| and this is
   // recursively invoked for all the children.
   void UpdateExpandedNodes(
@@ skipping 46 matching lines @@
   // Is the tree shown?
   bool show_tree_;
 
   // List of deleted bookmark folders.
   std::vector<int64_t> deletes_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkEditorView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_EDITOR_VIEW_H_