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

mojo/edk/system/ipc_support_unittest.cc

 // Copyright 2015 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 "mojo/edk/system/ipc_support.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 44 matching lines @@
   ASSERT_EQ(
       MOJO_RESULT_OK,
       read_mp->AddAwakable(&waiter, MOJO_HANDLE_SIGNAL_READABLE, 0, nullptr));
 
   // Write a message with just 'x' through the write end.
   EXPECT_EQ(MOJO_RESULT_OK,
             write_mp->WriteMessage(UserPointer<const void>("x"), 1, nullptr,
                                    MOJO_WRITE_MESSAGE_FLAG_NONE));
 
   // Wait for it to arrive.
-  EXPECT_EQ(MOJO_RESULT_OK, waiter.Wait(test::ActionTimeout(), nullptr));
+  EXPECT_EQ(MOJO_RESULT_OK,
+            waiter.Wait(test::ActionTimeout(), nullptr, nullptr));
   read_mp->RemoveAwakable(&waiter, nullptr);
 
   // Read the message from the read end.
   char buffer[10] = {};
   uint32_t buffer_size = static_cast<uint32_t>(sizeof(buffer));
   EXPECT_EQ(MOJO_RESULT_OK,
             read_mp->ReadMessage(UserPointer<void>(buffer),
                                  MakeUserPointer(&buffer_size), 0, nullptr,
                                  MOJO_READ_MESSAGE_FLAG_NONE));
   EXPECT_EQ(1u, buffer_size);
@@ skipping 26 matching lines @@
   CHECK(transport.is_valid());
   std::vector<HandleTransport> transports;
   transports.push_back(transport);
   CHECK_EQ(write_mp->WriteMessage(NullUserPointer(), 0, &transports,
                                   MOJO_WRITE_MESSAGE_FLAG_NONE),
            MOJO_RESULT_OK);
   transport.End();
   mp_handle_to_send.reset();
 
   // Wait for it to arrive.
-  CHECK_EQ(waiter.Wait(test::ActionTimeout(), nullptr), MOJO_RESULT_OK);
+  CHECK_EQ(waiter.Wait(test::ActionTimeout(), nullptr, nullptr),
+           MOJO_RESULT_OK);
   read_mp->RemoveAwakable(&waiter, nullptr);
 
   // Read the message from the read end.
   HandleVector handles;
   uint32_t num_handles = 10;
   CHECK_EQ(read_mp->ReadMessage(NullUserPointer(), NullUserPointer(), &handles,
                                 &num_handles, MOJO_READ_MESSAGE_FLAG_NONE),
            MOJO_RESULT_OK);
   CHECK_EQ(handles.size(), 1u);
   CHECK_EQ(num_handles, 1u);
@@ skipping 593 matching lines @@
 
   test_io_thread.PostTaskAndWait(
       [&ipc_support]() { ipc_support.ShutdownOnIOThread(); });
 }
 
 // TODO(vtl): Also test the case of the master "dying" before the slave. (The
 // slave should get OnMasterDisconnect(), which we currently don't test.)
 
 }  // namespace system
 }  // namespace mojo