| Index: components/sync_bookmarks/bookmark_data_type_controller_unittest.cc
|
| diff --git a/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc b/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc
|
| index 699a1ffcea06e1d019aaef4312eb6fed6c793c18..137671c82035933743d522e7a93cbd4bc3878e6e 100644
|
| --- a/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc
|
| +++ b/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc
|
| @@ -71,11 +71,12 @@ class SyncBookmarkDataTypeControllerTest : public testing::Test,
|
| void SetUp() override {
|
| model_associator_ = new ModelAssociatorMock();
|
| change_processor_ = new ChangeProcessorMock();
|
| - history_service_.reset(new HistoryMock());
|
| - profile_sync_factory_.reset(new syncer::SyncApiComponentFactoryMock(
|
| - model_associator_, change_processor_));
|
| - bookmark_dtc_.reset(
|
| - new BookmarkDataTypeController(base::Bind(&base::DoNothing), this));
|
| + history_service_ = base::MakeUnique<HistoryMock>();
|
| + profile_sync_factory_ =
|
| + base::MakeUnique<syncer::SyncApiComponentFactoryMock>(
|
| + model_associator_, change_processor_);
|
| + bookmark_dtc_ = base::MakeUnique<BookmarkDataTypeController>(
|
| + base::Bind(&base::DoNothing), this);
|
| }
|
|
|
| protected:
|
| @@ -85,8 +86,8 @@ class SyncBookmarkDataTypeControllerTest : public testing::Test,
|
| };
|
|
|
| void CreateBookmarkModel(BookmarkLoadPolicy bookmark_load_policy) {
|
| - bookmark_model_.reset(
|
| - new BookmarkModel(base::MakeUnique<bookmarks::TestBookmarkClient>()));
|
| + bookmark_model_ = base::MakeUnique<BookmarkModel>(
|
| + base::MakeUnique<bookmarks::TestBookmarkClient>());
|
| if (bookmark_load_policy == LOAD_MODEL) {
|
| TestingPrefServiceSimple prefs;
|
| bookmark_model_->Load(&prefs, base::FilePath(),
|
|
|