[mojo-edk] Add MojoWatch and MojoCancelWatch APIs

mojo/edk/system/wait_set_dispatcher_unittest.cc

Index: mojo/edk/system/wait_set_dispatcher_unittest.cc
diff --git a/mojo/edk/system/wait_set_dispatcher_unittest.cc b/mojo/edk/system/wait_set_dispatcher_unittest.cc
index 103470547874e6ac92ee9a69fb2905915975f6bf..d8fe4dda35ae38f751d5e14d8cd1949c7b965eb6 100644
--- a/mojo/edk/system/wait_set_dispatcher_unittest.cc
+++ b/mojo/edk/system/wait_set_dispatcher_unittest.cc
@@ -33,8 +33,9 @@ class WaitSetDispatcherTest : public ::testing::Test {
   }
 
   void TearDown() override {
+    Dispatcher::RequestContext request_context;
     for (auto& d : dispatchers_to_close_)
-      d->Close();
+      d->Close(&request_context);
   }
 
   MojoResult GetOneReadyDispatcher(
@@ -98,6 +99,7 @@ TEST_F(WaitSetDispatcherTest, Basic) {
             wait_set->AddWaitingDispatcher(dispatcher1_,
                                            MOJO_HANDLE_SIGNAL_WRITABLE, 2));
 
+  Dispatcher::RequestContext request_context;
   Waiter w;
   uintptr_t context = 0;
   w.Init();
@@ -138,7 +140,8 @@ TEST_F(WaitSetDispatcherTest, Basic) {
   w.Init();
   ASSERT_EQ(MOJO_RESULT_OK,
             dispatcher1_->WriteMessage(buffer, sizeof(buffer), nullptr, 0,
-                                       MOJO_WRITE_MESSAGE_FLAG_NONE));
+                                       MOJO_WRITE_MESSAGE_FLAG_NONE,
+                                       &request_context));
   EXPECT_EQ(MOJO_RESULT_OK, w.Wait(MOJO_DEADLINE_INDEFINITE, nullptr));
   woken_dispatcher = nullptr;
   context = 0;
@@ -164,6 +167,7 @@ TEST_F(WaitSetDispatcherTest, HandleWithoutRemoving) {
             wait_set->AddWaitingDispatcher(dispatcher0_,
                                            MOJO_HANDLE_SIGNAL_READABLE, 1));
 
+  Dispatcher::RequestContext request_context;
   Waiter w;
   uintptr_t context = 0;
   w.Init();
@@ -185,7 +189,8 @@ TEST_F(WaitSetDispatcherTest, HandleWithoutRemoving) {
     w.Init();
     ASSERT_EQ(MOJO_RESULT_OK,
               dispatcher1_->WriteMessage(buffer, sizeof(buffer), nullptr, 0,
-                                         MOJO_WRITE_MESSAGE_FLAG_NONE));
+                                         MOJO_WRITE_MESSAGE_FLAG_NONE,
+                                         &request_context));
     EXPECT_EQ(MOJO_RESULT_OK, w.Wait(MOJO_DEADLINE_INDEFINITE, nullptr));
     woken_dispatcher = nullptr;
     context = 0;
@@ -199,7 +204,8 @@ TEST_F(WaitSetDispatcherTest, HandleWithoutRemoving) {
     uint32_t num_bytes = sizeof(read_buffer);
     ASSERT_EQ(MOJO_RESULT_OK,
               dispatcher0_->ReadMessage(read_buffer, &num_bytes, nullptr,
-                                        nullptr, MOJO_READ_MESSAGE_FLAG_NONE));
+                                        nullptr, MOJO_READ_MESSAGE_FLAG_NONE,
+                                        &request_context));
     EXPECT_EQ(sizeof(buffer), num_bytes);
 
     // No dispatchers are ready.
@@ -237,6 +243,7 @@ TEST_F(WaitSetDispatcherTest, MultipleReady) {
             wait_set->AddWaitingDispatcher(mp1_dispatcher1,
                                            MOJO_HANDLE_SIGNAL_WRITABLE, 0));
 
+  Dispatcher::RequestContext request_context;
   Waiter w;
   w.Init();
   HandleSignalsState hss;
@@ -312,7 +319,8 @@ TEST_F(WaitSetDispatcherTest, MultipleReady) {
   w.Init();
   ASSERT_EQ(MOJO_RESULT_OK,
             dispatcher1_->WriteMessage(buffer, sizeof(buffer), nullptr, 0,
-                                       MOJO_WRITE_MESSAGE_FLAG_NONE));
+                                       MOJO_WRITE_MESSAGE_FLAG_NONE,
+                                       &request_context));
   {
     Waiter mp_w;
     mp_w.Init();
@@ -362,7 +370,8 @@ TEST_F(WaitSetDispatcherTest, InvalidParams) {
             wait_set->RemoveWaitingDispatcher(dispatcher1_));
 
   // Add to a closed wait set.
-  wait_set->Close();
+  Dispatcher::RequestContext request_context;
+  wait_set->Close(&request_context);
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             wait_set->AddWaitingDispatcher(dispatcher0_,
                                            MOJO_HANDLE_SIGNAL_READABLE, 0));
@@ -392,6 +401,7 @@ TEST_F(WaitSetDispatcherTest, ClosedDispatchers) {
   scoped_refptr<WaitSetDispatcher> wait_set = new WaitSetDispatcher();
   CloseOnShutdown(wait_set);
 
+  Dispatcher::RequestContext request_context;
   Waiter w;
   w.Init();
   HandleSignalsState hss;
@@ -401,7 +411,7 @@ TEST_F(WaitSetDispatcherTest, ClosedDispatchers) {
                                            MOJO_HANDLE_SIGNAL_READABLE, 0));
   EXPECT_EQ(MOJO_RESULT_OK,
             wait_set->AddAwakable(&w, MOJO_HANDLE_SIGNAL_READABLE, 0, &hss));
-  dispatcher0_->Close();
+  dispatcher0_->Close(&request_context);
   EXPECT_EQ(MOJO_RESULT_OK, w.Wait(MOJO_DEADLINE_INDEFINITE, nullptr));
   EXPECT_TRUE(
       wait_set->GetHandleSignalsState().satisfies(MOJO_HANDLE_SIGNAL_READABLE));