Fix BookmarkPermanentNode leak in ChromeBookmarkClient

chrome/browser/bookmarks/chrome_bookmark_client.cc

Index: chrome/browser/bookmarks/chrome_bookmark_client.cc
diff --git a/chrome/browser/bookmarks/chrome_bookmark_client.cc b/chrome/browser/bookmarks/chrome_bookmark_client.cc
index 5d236367ff2c29ecdf820423dd7038f9b6370f05..c505650ce0a1dab375a40ce844ecb122c7ab0902 100644
--- a/chrome/browser/bookmarks/chrome_bookmark_client.cc
+++ b/chrome/browser/bookmarks/chrome_bookmark_client.cc
@@ -165,17 +165,16 @@ void ChromeBookmarkClient::RecordAction(const base::UserMetricsAction& action) {
 bookmarks::LoadExtraCallback ChromeBookmarkClient::GetLoadExtraNodesCallback() {
   // Create the managed_node now; it will be populated in the LoadExtraNodes
   // callback.
-  managed_node_ = new BookmarkPermanentNode(0);
-  // The ownership of this object is in limbo until the LoadExtraNodes task
-  // runs, but in a ProfileBrowserTest this never happens.
-  // crbug.com/391508
-  ANNOTATE_LEAKING_OBJECT_PTR(managed_node_);
+  // The ownership of maanaged_node_ is in limbo until LoadExtraNodes runs,

[gab, 2014/07/07 18:12:47]

s/maanaged/managed

[Sigurður Ásgeirsson, 2014/07/07 18:40:19]

Done.

+  // so we leave it in the care of the closure meanwhile.
+  scoped_ptr<BookmarkPermanentNode> managed(new BookmarkPermanentNode(0));
+  managed_node_ = managed.get();

[gab, 2014/07/07 18:12:47]

So is the only purpose of storing this as a member for pointer comparison later?
If so, would it make sense to use a void* (or perhaps a new type typedef'ed to
void* for clarity)?

I don't like that there is a fully typed pointer in this class which no one
should ever deref...

[Sigurður Ásgeirsson, 2014/07/07 18:40:19]

The member is used by ChromeBookmarkClient::BookmarkModelLoaded, but I don't
understand the contract, so can't say which thread that'll run on. I can't
naively change this even to a const pointer...

 
   return base::Bind(
       &ChromeBookmarkClient::LoadExtraNodes,
       StartupTaskRunnerServiceFactory::GetForProfile(profile_)
           ->GetBookmarkTaskRunner(),
-      managed_node_,
+      base::Passed(&managed),
       base::Passed(managed_bookmarks_tracker_->GetInitialManagedBookmarks()));
 }
 
@@ -241,7 +240,7 @@ void ChromeBookmarkClient::BookmarkModelLoaded(BookmarkModel* model,
 // static
 bookmarks::BookmarkPermanentNodeList ChromeBookmarkClient::LoadExtraNodes(
     const scoped_refptr<base::DeferredSequencedTaskRunner>& profile_io_runner,
-    BookmarkPermanentNode* managed_node,
+    scoped_ptr<BookmarkPermanentNode> managed_node,
     scoped_ptr<base::ListValue> initial_managed_bookmarks,
     int64* next_node_id) {
   DCHECK(profile_io_runner->RunsTasksOnCurrentThread());
@@ -250,13 +249,15 @@ bookmarks::BookmarkPermanentNodeList ChromeBookmarkClient::LoadExtraNodes(
   int64 managed_id = *next_node_id;
   managed_node->set_id(managed_id);
   *next_node_id = policy::ManagedBookmarksTracker::LoadInitial(
-      managed_node, initial_managed_bookmarks.get(), managed_id + 1);
+      managed_node.get(), initial_managed_bookmarks.get(), managed_id + 1);
   managed_node->set_visible(!managed_node->empty());
   managed_node->SetTitle(
       l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME));
 
   bookmarks::BookmarkPermanentNodeList extra_nodes;
-  extra_nodes.push_back(managed_node);
+  // Ownership of the managed node passed to the caller.
+  extra_nodes.push_back(managed_node.release());
+
   return extra_nodes.Pass();
 }