Change ownership of BookmarkClient

components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc

Index: components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
index de8217bbd5365dd7918ce7768bd68c0f8b0ec5f5..5d125414a3c15995d51bd2885fe3b4d5094fe835 100644
--- a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
@@ -42,20 +42,22 @@ class BookmarkExpandedStateTrackerTest : public testing::Test {
   void TearDown() override;
 
   base::MessageLoop message_loop_;
-  TestBookmarkClient client_;
   scoped_ptr<PrefService> prefs_;
   scoped_ptr<BookmarkModel> model_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkExpandedStateTrackerTest);
 };
 
-BookmarkExpandedStateTrackerTest::BookmarkExpandedStateTrackerTest() {}
+BookmarkExpandedStateTrackerTest::BookmarkExpandedStateTrackerTest() {
+}
 
-BookmarkExpandedStateTrackerTest::~BookmarkExpandedStateTrackerTest() {}
+BookmarkExpandedStateTrackerTest::~BookmarkExpandedStateTrackerTest() {
+}
 
 void BookmarkExpandedStateTrackerTest::SetUp() {
   prefs_ = PrefServiceForTesting();
-  model_.reset(new BookmarkModel(&client_));
+  model_ = TestBookmarkClient::CreateModel(BookmarkPermanentNodeList(), nullptr,
+                                           true);
   model_->Load(prefs_.get(), std::string(), base::FilePath(),
                base::ThreadTaskRunnerHandle::Get(),
                base::ThreadTaskRunnerHandle::Get());