Fix object ownership in ui/base/models.

components/bookmarks/test/test_bookmark_client.cc

 // 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.
 
 #include "components/bookmarks/test/test_bookmark_client.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 23 matching lines @@
       new BookmarkModel(std::move(client)));
   std::unique_ptr<BookmarkLoadDetails> details =
       bookmark_model->CreateLoadDetails();
   details->LoadExtraNodes();
   bookmark_model->DoneLoading(std::move(details));
   return bookmark_model;
 }
 
 void TestBookmarkClient::SetExtraNodesToLoad(
     BookmarkPermanentNodeList extra_nodes) {
-  extra_nodes_to_load_ = std::move(extra_nodes);
-  // Keep a copy in |extra_nodes_| for the acessor.
-  extra_nodes_ = extra_nodes_to_load_.get();
+  extra_nodes_ = std::move(extra_nodes);
+  // Keep a copy of the nodes in |unowned_extra_nodes_| for the accessor
+  // functions.
+  for (const auto& node : extra_nodes_)
+    unowned_extra_nodes_.push_back(node.get());
 }
 
 bool TestBookmarkClient::IsExtraNodeRoot(const BookmarkNode* node) {
-  for (size_t i = 0; i < extra_nodes_.size(); ++i) {
-    if (node == extra_nodes_[i])
-      return true;
-  }
-  return false;
+  return std::find(unowned_extra_nodes_.begin(), unowned_extra_nodes_.end(),
+                   node) != unowned_extra_nodes_.end();
 }
 
 bool TestBookmarkClient::IsAnExtraNode(const BookmarkNode* node) {
   if (!node)
     return false;
-  for (size_t i = 0; i < extra_nodes_.size(); ++i) {
-    if (node->HasAncestor(extra_nodes_[i]))
+  for (const auto* extra_node : unowned_extra_nodes_) {
+    if (node->HasAncestor(extra_node))
       return true;
   }
   return false;
 }
 
 bool TestBookmarkClient::IsPermanentNodeVisible(
     const BookmarkPermanentNode* node) {
   DCHECK(node->type() == BookmarkNode::BOOKMARK_BAR ||
          node->type() == BookmarkNode::OTHER_NODE ||
          node->type() == BookmarkNode::MOBILE ||
          IsExtraNodeRoot(node));
   return node->type() != BookmarkNode::MOBILE && !IsExtraNodeRoot(node);
 }
 
 void TestBookmarkClient::RecordAction(const base::UserMetricsAction& action) {
 }
 
 LoadExtraCallback TestBookmarkClient::GetLoadExtraNodesCallback() {
   return base::Bind(&TestBookmarkClient::LoadExtraNodes,
-                    base::Passed(&extra_nodes_to_load_));
+                    base::Passed(&extra_nodes_));
 }
 
 bool TestBookmarkClient::CanSetPermanentNodeTitle(
     const BookmarkNode* permanent_node) {
   return IsExtraNodeRoot(permanent_node);
 }
 
 bool TestBookmarkClient::CanSyncNode(const BookmarkNode* node) {
   return !IsAnExtraNode(node);
 }
 
 bool TestBookmarkClient::CanBeEditedByUser(const BookmarkNode* node) {
   return !IsAnExtraNode(node);
 }
 
 // static
 BookmarkPermanentNodeList TestBookmarkClient::LoadExtraNodes(
     BookmarkPermanentNodeList extra_nodes,
     int64_t* next_id) {
   return extra_nodes;
 }
 
 }  // namespace bookmarks