diff options
Diffstat (limited to 'components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc')
| -rw-r--r-- | components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc index 3ce78c3..83f3bcd 100644 --- a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc +++ b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc @@ -63,9 +63,11 @@ class ManagedBookmarksTrackerTest : public testing::Test { BookmarkPermanentNodeList extra_nodes; extra_nodes.push_back(managed_node); - client_.SetExtraNodesToLoad(std::move(extra_nodes)); - model_.reset(new BookmarkModel(&client_)); + scoped_ptr<TestBookmarkClient> client(new TestBookmarkClient); + client->SetExtraNodesToLoad(std::move(extra_nodes)); + model_.reset(new BookmarkModel(std::move(client))); + model_->AddObserver(&observer_); EXPECT_CALL(observer_, BookmarkModelLoaded(model_.get(), _)); model_->Load(&prefs_, std::string(), base::FilePath(), @@ -74,8 +76,10 @@ class ManagedBookmarksTrackerTest : public testing::Test { test::WaitForBookmarkModelToLoad(model_.get()); Mock::VerifyAndClearExpectations(&observer_); - ASSERT_EQ(1u, client_.extra_nodes().size()); - managed_node_ = client_.extra_nodes()[0]; + TestBookmarkClient* client_ptr = + static_cast<TestBookmarkClient*>(model_->client()); + ASSERT_EQ(1u, client_ptr->extra_nodes().size()); + managed_node_ = client_ptr->extra_nodes()[0]; ASSERT_EQ(managed_node, managed_node_); managed_bookmarks_tracker_.reset(new ManagedBookmarksTracker( @@ -168,7 +172,6 @@ class ManagedBookmarksTrackerTest : public testing::Test { base::MessageLoop loop_; TestingPrefServiceSimple prefs_; - TestBookmarkClient client_; scoped_ptr<BookmarkModel> model_; MockBookmarkModelObserver observer_; BookmarkPermanentNode* managed_node_; |