Change ownership of BookmarkClient

components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.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/browser/bookmark_expanded_state_tracker.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
 #include "base/prefs/testing_pref_store.h"
@@ skipping 24 matching lines @@
  public:
   BookmarkExpandedStateTrackerTest();
   ~BookmarkExpandedStateTrackerTest() override;
 
  protected:
   // testing::Test:
   void SetUp() override;
   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());
   test::WaitForBookmarkModelToLoad(model_.get());
 }
 
 void BookmarkExpandedStateTrackerTest::TearDown() {
   model_.reset();
 }
 
@@ skipping 34 matching lines @@
   tracker->SetExpandedNodes(nodes);
   // Verify that the node is present.
   EXPECT_EQ(nodes, tracker->GetExpandedNodes());
   // Call remove all.
   model_->RemoveAllUserBookmarks();
   // Verify node is not present.
   EXPECT_TRUE(tracker->GetExpandedNodes().empty());
 }
 
 }  // namespace bookmarks