Plumb the handle signals state out of Waiter::Wait().

mojo/edk/system/remote_message_pipe_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 <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <memory>
 #include <utility>
@@ skipping 188 matching lines @@
             mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
                              123, nullptr));
 
   // Write to MP 0, port 0.
   EXPECT_EQ(
       MOJO_RESULT_OK,
       mp0->WriteMessage(0, UserPointer<const void>(kHello), sizeof(kHello),
                         nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Wait.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(123u, context);
   hss = HandleSignalsState();
   mp1->RemoveAwakable(1, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Read from MP 1, port 1.
   EXPECT_EQ(MOJO_RESULT_OK,
             mp1->ReadMessage(1, UserPointer<void>(buffer),
                              MakeUserPointer(&buffer_size), nullptr, nullptr,
                              MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(sizeof(kHello), static_cast<size_t>(buffer_size));
   EXPECT_STREQ(kHello, buffer);
 
   // Write in the other direction: MP 1, port 1 -> ... -> MP 0, port 0.
 
   waiter.Init();
   ASSERT_EQ(MOJO_RESULT_OK,
             mp0->AddAwakable(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
                              456, nullptr));
 
   EXPECT_EQ(
       MOJO_RESULT_OK,
       mp1->WriteMessage(1, UserPointer<const void>(kWorld), sizeof(kWorld),
                         nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(456u, context);
   hss = HandleSignalsState();
   mp0->RemoveAwakable(0, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   buffer_size = static_cast<uint32_t>(sizeof(buffer));
   EXPECT_EQ(MOJO_RESULT_OK,
             mp0->ReadMessage(0, UserPointer<void>(buffer),
                              MakeUserPointer(&buffer_size), nullptr, nullptr,
                              MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(sizeof(kWorld), static_cast<size_t>(buffer_size));
   EXPECT_STREQ(kWorld, buffer);
 
   // Close MP 0, port 0.
   mp0->Close(0);
 
   // Try to wait for MP 1, port 1 to become readable. This will eventually fail
   // when it realizes that MP 0, port 0 has been closed. (It may also fail
   // immediately.)
   waiter.Init();
   hss = HandleSignalsState();
   MojoResult result = mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE,
                                        false, 789, &hss);
   if (result == MOJO_RESULT_OK) {
     EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
-              waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+              waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
     EXPECT_EQ(789u, context);
     hss = HandleSignalsState();
     mp1->RemoveAwakable(1, &waiter, &hss);
   }
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfiable_signals);
 
   // And MP 1, port 1.
   mp1->Close(1);
 }
@@ skipping 15 matching lines @@
 
   // Close MP 0, port 0.
   mp0->Close(0);
 
   // Try to wait for MP 1, port 1 to be signaled with peer closed.
   waiter.Init();
   hss = HandleSignalsState();
   MojoResult result = mp1->AddAwakable(
       1, &waiter, MOJO_HANDLE_SIGNAL_PEER_CLOSED, false, 101, &hss);
   if (result == MOJO_RESULT_OK) {
-    EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+    EXPECT_EQ(MOJO_RESULT_OK,
+              waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
     EXPECT_EQ(101u, context);
     hss = HandleSignalsState();
     mp1->RemoveAwakable(1, &waiter, &hss);
   }
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_PEER_CLOSED, hss.satisfiable_signals);
 
   // And MP 1, port 1.
   mp1->Close(1);
 }
@@ skipping 39 matching lines @@
   waiter.Init();
   ASSERT_EQ(MOJO_RESULT_OK,
             mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
                              123, nullptr));
 
   EXPECT_EQ(MOJO_RESULT_OK,
             mp0->WriteMessage(0, UserPointer<const void>(endpoint_info.get()),
                               static_cast<uint32_t>(endpoint_info_size),
                               nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(123u, context);
   hss = HandleSignalsState();
   mp1->RemoveAwakable(1, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   EXPECT_EQ(endpoint_info_size, channels(1)->GetSerializedEndpointSize());
@@ skipping 19 matching lines @@
   waiter.Init();
   ASSERT_EQ(MOJO_RESULT_OK,
             mp3->AddAwakable(0, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
                              789, nullptr));
 
   EXPECT_EQ(
       MOJO_RESULT_OK,
       mp2->WriteMessage(0, UserPointer<const void>(kHello), sizeof(kHello),
                         nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(789u, context);
   hss = HandleSignalsState();
   mp3->RemoveAwakable(0, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Make sure there's nothing on MP 0, port 0 or MP 1, port 1 or MP 2, port 0.
@@ skipping 27 matching lines @@
   waiter.Init();
   ASSERT_EQ(MOJO_RESULT_OK,
             mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
                              123, nullptr));
 
   EXPECT_EQ(
       MOJO_RESULT_OK,
       mp0->WriteMessage(0, UserPointer<const void>(kWorld), sizeof(kWorld),
                         nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(123u, context);
   hss = HandleSignalsState();
   mp1->RemoveAwakable(1, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED | MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Make sure there's nothing on the other ports.
@@ skipping 59 matching lines @@
   // Prepare to wait on MP 1, port 1. (Add the waiter now. Otherwise, if we do
   // it later, it might already be readable.)
   waiter.Init();
   ASSERT_EQ(MOJO_RESULT_OK,
             mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
                              123, nullptr));
 
   BootstrapChannelEndpointNoWait(1, std::move(ep1));
 
   // Wait.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(123u, context);
   hss = HandleSignalsState();
   // Note: MP 1, port 1 should definitely should be readable, but it may or may
   // not appear as writable (there's a race, and it may not have noticed that
   // the other side was closed yet -- e.g., inserting a sleep here would make it
   // much more likely to notice that it's no longer writable).
   mp1->RemoveAwakable(1, &waiter, &hss);
   EXPECT_TRUE((hss.satisfied_signals & MOJO_HANDLE_SIGNAL_READABLE));
   EXPECT_TRUE((hss.satisfiable_signals & MOJO_HANDLE_SIGNAL_READABLE));
 
@@ skipping 41 matching lines @@
   // Prepare to wait on MP 1, port 1. (Add the waiter now. Otherwise, if we do
   // it later, it might already be readable.)
   waiter.Init();
   ASSERT_EQ(MOJO_RESULT_OK,
             mp1->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE, false,
                              123, nullptr));
 
   BootstrapChannelEndpointNoWait(1, std::move(ep1));
 
   // Wait.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(123u, context);
   hss = HandleSignalsState();
   // Note: MP 1, port 1 should definitely should be readable, but it may or may
   // not appear as writable (there's a race, and it may not have noticed that
   // the other side was closed yet -- e.g., inserting a sleep here would make it
   // much more likely to notice that it's no longer writable).
   mp1->RemoveAwakable(1, &waiter, &hss);
   EXPECT_TRUE((hss.satisfied_signals & MOJO_HANDLE_SIGNAL_READABLE));
   EXPECT_TRUE((hss.satisfiable_signals & MOJO_HANDLE_SIGNAL_READABLE));
 
@@ skipping 49 matching lines @@
                           &transports, MOJO_WRITE_MESSAGE_FLAG_NONE));
     transport.End();
 
     // |handle.dispatcher| should have been closed. This is |DCHECK()|ed when
     // the |handle.dispatcher| is destroyed.
     EXPECT_TRUE(handle.dispatcher->HasOneRef());
     handle.reset();
   }
 
   // Wait.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(123u, context);
   hss = HandleSignalsState();
   mp1->RemoveAwakable(1, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Read from MP 1, port 1.
@@ skipping 28 matching lines @@
   // Write to "local_mp", port 1.
   EXPECT_EQ(
       MOJO_RESULT_OK,
       local_mp->WriteMessage(1, UserPointer<const void>(kHello), sizeof(kHello),
                              nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // TODO(vtl): FIXME -- We (racily) crash if I close |dispatcher| immediately
   // here. (We don't crash if I sleep and then close.)
 
   // Wait for the dispatcher to become readable.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(456u, context);
   hss = HandleSignalsState();
   dispatcher->RemoveAwakable(&waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Read from the dispatcher.
@@ skipping 11 matching lines @@
   ASSERT_EQ(MOJO_RESULT_OK,
             local_mp->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE,
                                   false, 789, nullptr));
 
   // Write to the dispatcher.
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher->WriteMessage(
                                 UserPointer<const void>(kHello), sizeof(kHello),
                                 nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Wait.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(789u, context);
   hss = HandleSignalsState();
   local_mp->RemoveAwakable(1, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Read from "local_mp", port 1.
@@ skipping 88 matching lines @@
                           &transports, MOJO_WRITE_MESSAGE_FLAG_NONE));
     transport.End();
 
     // |handle.dispatcher| should have been closed. This is |DCHECK()|ed when
     // the |handle.dispatcher| is destroyed.
     EXPECT_TRUE(handle.dispatcher->HasOneRef());
     handle.reset();
   }
 
   // Wait.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(123u, context);
   hss = HandleSignalsState();
   mp1->RemoveAwakable(1, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Read from MP 1, port 1.
@@ skipping 113 matching lines @@
                           &transports, MOJO_WRITE_MESSAGE_FLAG_NONE));
     transport.End();
 
     // |handle.dispatcher| should have been closed. This is |DCHECK()|ed when
     // the |handle.dispatcher| is destroyed.
     EXPECT_TRUE(handle.dispatcher->HasOneRef());
     handle.reset();
   }
 
   // Wait.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(123u, context);
   hss = HandleSignalsState();
   mp1->RemoveAwakable(1, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Read from MP 1, port 1.
@@ skipping 94 matching lines @@
                           &transports, MOJO_WRITE_MESSAGE_FLAG_NONE));
     transport.End();
 
     // |handle.dispatcher| should have been closed. This is |DCHECK()|ed when
     // the |handle.dispatcher| is destroyed.
     EXPECT_TRUE(handle.dispatcher->HasOneRef());
     handle.reset();
   }
 
   // Wait.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(123u, context);
   hss = HandleSignalsState();
   mp1->RemoveAwakable(1, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Read from MP 1, port 1.
@@ skipping 119 matching lines @@
                           &transports, MOJO_WRITE_MESSAGE_FLAG_NONE));
     transport.End();
 
     // |handle.dispatcher| should have been closed. This is |DCHECK()|ed when
     // the |handle.dispatcher| is destroyed.
     EXPECT_TRUE(handle.dispatcher->HasOneRef());
     handle.reset();
   }
 
   // Wait.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(123u, context);
   hss = HandleSignalsState();
   mp1->RemoveAwakable(1, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Read from MP 1, port 1.
@@ skipping 41 matching lines @@
                           &transports, MOJO_WRITE_MESSAGE_FLAG_NONE));
     transport.End();
 
     // |handle.dispatcher| should have been closed. This is |DCHECK()|ed when
     // the |handle.dispatcher| is destroyed.
     EXPECT_TRUE(handle.dispatcher->HasOneRef());
     handle.reset();
   }
 
   // Wait.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(456u, context);
   hss = HandleSignalsState();
   mp0->RemoveAwakable(0, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Read from MP 0, port 0.
@@ skipping 24 matching lines @@
             dispatcher->AddAwakable(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 789,
                                     nullptr));
 
   // Write to "local_mp", port 1.
   EXPECT_EQ(
       MOJO_RESULT_OK,
       local_mp->WriteMessage(1, UserPointer<const void>(kHello), sizeof(kHello),
                              nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Wait for the dispatcher to become readable.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(789u, context);
   hss = HandleSignalsState();
   dispatcher->RemoveAwakable(&waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Read from the dispatcher.
@@ skipping 11 matching lines @@
   ASSERT_EQ(MOJO_RESULT_OK,
             local_mp->AddAwakable(1, &waiter, MOJO_HANDLE_SIGNAL_READABLE,
                                   false, 789, nullptr));
 
   // Write to the dispatcher.
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher->WriteMessage(
                                 UserPointer<const void>(kHello), sizeof(kHello),
                                 nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Wait.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(MOJO_DEADLINE_INDEFINITE, &context, nullptr));
   EXPECT_EQ(789u, context);
   hss = HandleSignalsState();
   local_mp->RemoveAwakable(1, &waiter, &hss);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE,
             hss.satisfied_signals);
   EXPECT_EQ(MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_WRITABLE |
                 MOJO_HANDLE_SIGNAL_PEER_CLOSED,
             hss.satisfiable_signals);
 
   // Read from "local_mp", port 1.
@@ skipping 13 matching lines @@
   mp0->Close(0);
   mp1->Close(1);
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
   // Note that |local_mp|'s port 0 belong to |dispatcher|, which was closed.
   local_mp->Close(1);
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo