Fix object ownership in ui/base/models.

chrome/browser/browsing_data/cookies_tree_model.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_BROWSING_DATA_COOKIES_TREE_MODEL_H_
 #define CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_
 
 // TODO(viettrungluu): This header file #includes far too much and has too much
 // inline code (which shouldn't be inline).
 
@@ skipping 160 matching lines @@
   virtual void DeleteStoredObjects();
 
   // Gets a pointer back to the associated model for the tree we are in.
   virtual CookiesTreeModel* GetModel() const;
 
   // Returns a struct with detailed information used to populate the details
   // part of the view.
   virtual DetailedInfo GetDetailedInfo() const = 0;
 
  protected:
-  void AddChildSortedByTitle(CookieTreeNode* new_child);
+  void AddChildSortedByTitle(std::unique_ptr<CookieTreeNode> new_child);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieTreeNode);
 };
 
 // CookieTreeRootNode ---------------------------------------------------------
 // The node at the root of the CookieTree that gets inserted into the view.
 class CookieTreeRootNode : public CookieTreeNode {
  public:
   explicit CookieTreeRootNode(CookiesTreeModel* model);
@@ skipping 100 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CookieTreeCookieNode);
 };
 
 class CookieTreeCookiesNode : public CookieTreeNode {
  public:
   CookieTreeCookiesNode();
   ~CookieTreeCookiesNode() override;
 
   DetailedInfo GetDetailedInfo() const override;
 
-  void AddCookieNode(CookieTreeCookieNode* child) {
-    AddChildSortedByTitle(child);
+  void AddCookieNode(std::unique_ptr<CookieTreeCookieNode> child) {
+    AddChildSortedByTitle(std::move(child));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieTreeCookiesNode);
 };
 
 // CookieTreeAppCacheNode -----------------------------------------------------
 class CookieTreeAppCacheNode : public CookieTreeNode {
  public:
   friend class CookieTreeAppCachesNode;
@@ skipping 14 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CookieTreeAppCacheNode);
 };
 
 class CookieTreeAppCachesNode : public CookieTreeNode {
  public:
   CookieTreeAppCachesNode();
   ~CookieTreeAppCachesNode() override;
 
   DetailedInfo GetDetailedInfo() const override;
 
-  void AddAppCacheNode(CookieTreeAppCacheNode* child) {
-    AddChildSortedByTitle(child);
+  void AddAppCacheNode(std::unique_ptr<CookieTreeAppCacheNode> child) {
+    AddChildSortedByTitle(std::move(child));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieTreeAppCachesNode);
 };
 
 // CookieTreeDatabaseNode -----------------------------------------------------
 class CookieTreeDatabaseNode : public CookieTreeNode {
  public:
   friend class CookieTreeDatabasesNode;
@@ skipping 17 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CookieTreeDatabaseNode);
 };
 
 class CookieTreeDatabasesNode : public CookieTreeNode {
  public:
   CookieTreeDatabasesNode();
   ~CookieTreeDatabasesNode() override;
 
   DetailedInfo GetDetailedInfo() const override;
 
-  void AddDatabaseNode(CookieTreeDatabaseNode* child) {
-    AddChildSortedByTitle(child);
+  void AddDatabaseNode(std::unique_ptr<CookieTreeDatabaseNode> child) {
+    AddChildSortedByTitle(std::move(child));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieTreeDatabasesNode);
 };
 
 // CookieTreeFileSystemNode --------------------------------------------------
 class CookieTreeFileSystemNode : public CookieTreeNode {
  public:
   friend class CookieTreeFileSystemsNode;
@@ skipping 17 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CookieTreeFileSystemNode);
 };
 
 class CookieTreeFileSystemsNode : public CookieTreeNode {
  public:
   CookieTreeFileSystemsNode();
   ~CookieTreeFileSystemsNode() override;
 
   DetailedInfo GetDetailedInfo() const override;
 
-  void AddFileSystemNode(CookieTreeFileSystemNode* child) {
-    AddChildSortedByTitle(child);
+  void AddFileSystemNode(std::unique_ptr<CookieTreeFileSystemNode> child) {
+    AddChildSortedByTitle(std::move(child));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieTreeFileSystemsNode);
 };
 
 // CookieTreeLocalStorageNode -------------------------------------------------
 class CookieTreeLocalStorageNode : public CookieTreeNode {
  public:
   // local_storage_info should remain valid at least as long as the
@@ skipping 16 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CookieTreeLocalStorageNode);
 };
 
 class CookieTreeLocalStoragesNode : public CookieTreeNode {
  public:
   CookieTreeLocalStoragesNode();
   ~CookieTreeLocalStoragesNode() override;
 
   DetailedInfo GetDetailedInfo() const override;
 
-  void AddLocalStorageNode(CookieTreeLocalStorageNode* child) {
-    AddChildSortedByTitle(child);
+  void AddLocalStorageNode(std::unique_ptr<CookieTreeLocalStorageNode> child) {
+    AddChildSortedByTitle(std::move(child));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieTreeLocalStoragesNode);
 };
 
 
 // CookieTreeSessionStorageNode -----------------------------------------------
 class CookieTreeSessionStorageNode : public CookieTreeNode {
  public:
@@ skipping 17 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CookieTreeSessionStorageNode);
 };
 
 class CookieTreeSessionStoragesNode : public CookieTreeNode {
  public:
   CookieTreeSessionStoragesNode();
   ~CookieTreeSessionStoragesNode() override;
 
   DetailedInfo GetDetailedInfo() const override;
 
-  void AddSessionStorageNode(CookieTreeSessionStorageNode* child) {
-    AddChildSortedByTitle(child);
+  void AddSessionStorageNode(
+      std::unique_ptr<CookieTreeSessionStorageNode> child) {
+    AddChildSortedByTitle(std::move(child));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieTreeSessionStoragesNode);
 };
 
 // CookieTreeIndexedDBNode -----------------------------------------------
 class CookieTreeIndexedDBNode : public CookieTreeNode {
  public:
   // indexed_db_info should remain valid at least as long as the
@@ skipping 16 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CookieTreeIndexedDBNode);
 };
 
 class CookieTreeIndexedDBsNode : public CookieTreeNode {
  public:
   CookieTreeIndexedDBsNode();
   ~CookieTreeIndexedDBsNode() override;
 
   DetailedInfo GetDetailedInfo() const override;
 
-  void AddIndexedDBNode(CookieTreeIndexedDBNode* child) {
-    AddChildSortedByTitle(child);
+  void AddIndexedDBNode(std::unique_ptr<CookieTreeIndexedDBNode> child) {
+    AddChildSortedByTitle(std::move(child));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieTreeIndexedDBsNode);
 };
 
 // CookieTreeQuotaNode --------------------------------------------------
 class CookieTreeQuotaNode : public CookieTreeNode {
  public:
   // quota_info should remain valid at least as long as the CookieTreeQuotaNode
@@ skipping 36 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CookieTreeChannelIDNode);
 };
 
 class CookieTreeChannelIDsNode : public CookieTreeNode {
  public:
   CookieTreeChannelIDsNode();
   ~CookieTreeChannelIDsNode() override;
 
   DetailedInfo GetDetailedInfo() const override;
 
-  void AddChannelIDNode(CookieTreeChannelIDNode* child) {
-    AddChildSortedByTitle(child);
+  void AddChannelIDNode(std::unique_ptr<CookieTreeChannelIDNode> child) {
+    AddChildSortedByTitle(std::move(child));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieTreeChannelIDsNode);
 };
 
 // CookieTreeServiceWorkerNode -----------------------------------------------
 class CookieTreeServiceWorkerNode : public CookieTreeNode {
  public:
   // service_worker_info should remain valid at least as long as the
@@ skipping 14 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CookieTreeServiceWorkerNode);
 };
 
 class CookieTreeServiceWorkersNode : public CookieTreeNode {
  public:
   CookieTreeServiceWorkersNode();
   ~CookieTreeServiceWorkersNode() override;
 
   DetailedInfo GetDetailedInfo() const override;
 
-  void AddServiceWorkerNode(CookieTreeServiceWorkerNode* child) {
-    AddChildSortedByTitle(child);
+  void AddServiceWorkerNode(
+      std::unique_ptr<CookieTreeServiceWorkerNode> child) {
+    AddChildSortedByTitle(std::move(child));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieTreeServiceWorkersNode);
 };
 
 // CookieTreeCacheStorageNode -----------------------------------------------
 class CookieTreeCacheStorageNode : public CookieTreeNode {
  public:
   // cache_storage_info should remain valid at least as long as the
@@ skipping 14 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CookieTreeCacheStorageNode);
 };
 
 class CookieTreeCacheStoragesNode : public CookieTreeNode {
  public:
   CookieTreeCacheStoragesNode();
   ~CookieTreeCacheStoragesNode() override;
 
   DetailedInfo GetDetailedInfo() const override;
 
-  void AddCacheStorageNode(CookieTreeCacheStorageNode* child) {
-    AddChildSortedByTitle(child);
+  void AddCacheStorageNode(std::unique_ptr<CookieTreeCacheStorageNode> child) {
+    AddChildSortedByTitle(std::move(child));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CookieTreeCacheStoragesNode);
 };
 
 // CookieTreeFlashLSONode ----------------------------------------------------
 class CookieTreeFlashLSONode : public CookieTreeNode {
  public:
   explicit CookieTreeFlashLSONode(const std::string& domain);
@@ skipping 197 matching lines @@
 
   // Counts how many batches have started already. If this is non-zero and lower
   // than batches_ended_, then this model is still batching updates.
   int batches_started_ = 0;
 
   // Counts how many batches have finished.
   int batches_ended_ = 0;
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_COOKIES_TREE_MODEL_H_