| Index: components/sync_driver/non_ui_data_type_controller_unittest.cc
|
| diff --git a/components/sync_driver/non_ui_data_type_controller_unittest.cc b/components/sync_driver/non_ui_data_type_controller_unittest.cc
|
| index 6a1ccdeaeabbf50a4a58237e1e36dcf707fb4d84..e4c69a03a8ff2d6e3bc3293f233b8eb3f85372a8 100644
|
| --- a/components/sync_driver/non_ui_data_type_controller_unittest.cc
|
| +++ b/components/sync_driver/non_ui_data_type_controller_unittest.cc
|
| @@ -202,7 +202,8 @@ class SyncNonUIDataTypeControllerTest : public testing::Test,
|
| void TearDown() override { backend_thread_.Stop(); }
|
|
|
| void WaitForDTC() {
|
| - WaitableEvent done(true, false);
|
| + WaitableEvent done(base::WaitableEvent::ResetPolicy::MANUAL,
|
| + base::WaitableEvent::InitialState::NOT_SIGNALED);
|
| backend_thread_.task_runner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&SyncNonUIDataTypeControllerTest::SignalDone, &done));
|
| @@ -386,8 +387,12 @@ TEST_F(SyncNonUIDataTypeControllerTest,
|
| // Trigger a Stop() call when we check if the model associator has user created
|
| // nodes.
|
| TEST_F(SyncNonUIDataTypeControllerTest, AbortDuringAssociation) {
|
| - WaitableEvent wait_for_db_thread_pause(false, false);
|
| - WaitableEvent pause_db_thread(false, false);
|
| + WaitableEvent wait_for_db_thread_pause(
|
| + base::WaitableEvent::ResetPolicy::AUTOMATIC,
|
| + base::WaitableEvent::InitialState::NOT_SIGNALED);
|
| + WaitableEvent pause_db_thread(
|
| + base::WaitableEvent::ResetPolicy::AUTOMATIC,
|
| + base::WaitableEvent::InitialState::NOT_SIGNALED);
|
|
|
| SetStartExpectations();
|
| EXPECT_CALL(*change_processor_.get(), Connect(_, _, _, _, _, _))
|
|
|