Index: base/synchronization/waitable_event_watcher_unittest.cc |
diff --git a/base/synchronization/waitable_event_watcher_unittest.cc b/base/synchronization/waitable_event_watcher_unittest.cc |
index 58444b3c4ef2b861cb66e5bc71e4f340289271b0..6ec55cedea94addfcf79892f84228aba78d9650c 100644 |
--- a/base/synchronization/waitable_event_watcher_unittest.cc |
+++ b/base/synchronization/waitable_event_watcher_unittest.cc |
@@ -48,7 +48,8 @@ void RunTest_BasicSignal(MessageLoop::Type message_loop_type) { |
MessageLoop message_loop(message_loop_type); |
// A manual-reset event that is not yet signaled. |
- WaitableEvent event(true, false); |
+ WaitableEvent event(WaitableEvent::ResetPolicy::MANUAL, |
+ WaitableEvent::InitialState::NOT_SIGNALED); |
WaitableEventWatcher watcher; |
EXPECT_TRUE(watcher.GetWatchedEvent() == NULL); |
@@ -67,7 +68,8 @@ void RunTest_BasicCancel(MessageLoop::Type message_loop_type) { |
MessageLoop message_loop(message_loop_type); |
// A manual-reset event that is not yet signaled. |
- WaitableEvent event(true, false); |
+ WaitableEvent event(WaitableEvent::ResetPolicy::MANUAL, |
+ WaitableEvent::InitialState::NOT_SIGNALED); |
WaitableEventWatcher watcher; |
@@ -80,7 +82,8 @@ void RunTest_CancelAfterSet(MessageLoop::Type message_loop_type) { |
MessageLoop message_loop(message_loop_type); |
// A manual-reset event that is not yet signaled. |
- WaitableEvent event(true, false); |
+ WaitableEvent event(WaitableEvent::ResetPolicy::MANUAL, |
+ WaitableEvent::InitialState::NOT_SIGNALED); |
WaitableEventWatcher watcher; |
@@ -108,7 +111,8 @@ void RunTest_OutlivesMessageLoop(MessageLoop::Type message_loop_type) { |
// Simulate a MessageLoop that dies before an WaitableEventWatcher. This |
// ordinarily doesn't happen when people use the Thread class, but it can |
// happen when people use the Singleton pattern or atexit. |
- WaitableEvent event(true, false); |
+ WaitableEvent event(WaitableEvent::ResetPolicy::MANUAL, |
+ WaitableEvent::InitialState::NOT_SIGNALED); |
{ |
WaitableEventWatcher watcher; |
{ |
@@ -128,7 +132,9 @@ void RunTest_DeleteUnder(MessageLoop::Type message_loop_type) { |
{ |
WaitableEventWatcher watcher; |
- WaitableEvent* event = new WaitableEvent(false, false); |
+ WaitableEvent* event = |
+ new WaitableEvent(WaitableEvent::ResetPolicy::AUTOMATIC, |
+ WaitableEvent::InitialState::NOT_SIGNALED); |
watcher.StartWatching(event, Bind(&QuitWhenSignaled)); |
delete event; |