Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Unified Diff: components/bookmarks/test/test_bookmark_client.h

Issue 2379863002: Fix object ownership in ui/base/models. (Closed)
Patch Set: fix Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/bookmarks/test/test_bookmark_client.h
diff --git a/components/bookmarks/test/test_bookmark_client.h b/components/bookmarks/test/test_bookmark_client.h
index b5206f0da53b856bc6a854475d8b1b49578327be..ac212bf648b8cfcaca3d995600345e44a4f45f58 100644
--- a/components/bookmarks/test/test_bookmark_client.h
+++ b/components/bookmarks/test/test_bookmark_client.h
@@ -33,8 +33,8 @@ class TestBookmarkClient : public BookmarkClient {
void SetExtraNodesToLoad(BookmarkPermanentNodeList extra_nodes);
// Returns the current extra_nodes, set via SetExtraNodesToLoad().
- const std::vector<BookmarkPermanentNode*>& extra_nodes() {
- return extra_nodes_;
+ const std::vector<BookmarkPermanentNode*> extra_nodes() {
+ return unowned_extra_nodes_;
}
// Returns true if |node| is one of the |extra_nodes_|.
@@ -57,8 +57,8 @@ class TestBookmarkClient : public BookmarkClient {
BookmarkPermanentNodeList extra_nodes,
int64_t* next_id);
- BookmarkPermanentNodeList extra_nodes_to_load_;
- std::vector<BookmarkPermanentNode*> extra_nodes_;
+ BookmarkPermanentNodeList extra_nodes_;
+ std::vector<BookmarkPermanentNode*> unowned_extra_nodes_;
DISALLOW_COPY_AND_ASSIGN(TestBookmarkClient);
};
« no previous file with comments | « components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc ('k') | components/bookmarks/test/test_bookmark_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698