Change ownership of BookmarkClient

components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc

Index: components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
diff --git a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
index 0ca2d78a3d924b04fa80ed9f15ef43dbeb5330f3..9cac351b0db06165445581efdf34a63b6cd59a24 100644
--- a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
+++ b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
@@ -59,11 +59,11 @@ class ManagedBookmarksTrackerTest : public testing::Test {
         is_supervised ? IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME
                       : IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME));
 
+    bookmarks::TestBookmarkClient* client = nullptr;
     bookmarks::BookmarkPermanentNodeList extra_nodes;
     extra_nodes.push_back(managed_node);
-    client_.SetExtraNodesToLoad(extra_nodes.Pass());
 
-    model_.reset(new BookmarkModel(&client_));
+    model_ = TestBookmarkClient::CreateModel(extra_nodes.Pass(), &client, true);
     model_->AddObserver(&observer_);
     EXPECT_CALL(observer_, BookmarkModelLoaded(model_.get(), _));
     model_->Load(&prefs_, std::string(), base::FilePath(),
@@ -72,8 +72,8 @@ class ManagedBookmarksTrackerTest : public testing::Test {
     bookmarks::test::WaitForBookmarkModelToLoad(model_.get());
     Mock::VerifyAndClearExpectations(&observer_);
 
-    ASSERT_EQ(1u, client_.extra_nodes().size());
-    managed_node_ = client_.extra_nodes()[0];
+    ASSERT_EQ(1u, client->extra_nodes().size());
+    managed_node_ = client->extra_nodes()[0];
     ASSERT_EQ(managed_node, managed_node_);
 
     managed_bookmarks_tracker_.reset(new ManagedBookmarksTracker(
@@ -166,7 +166,6 @@ class ManagedBookmarksTrackerTest : public testing::Test {
 
   base::MessageLoop loop_;
   TestingPrefServiceSimple prefs_;
-  bookmarks::TestBookmarkClient client_;
   scoped_ptr<BookmarkModel> model_;
   bookmarks::MockBookmarkModelObserver observer_;
   BookmarkPermanentNode* managed_node_;