Mojo: Move waiting APIs to public library

mojo/edk/system/multiprocess_message_pipe_unittest.cc

 // Copyright 2013 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 <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
 #include <string>
@@ skipping 14 matching lines @@
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/system/handle_signals_state.h"
 #include "mojo/edk/system/test_utils.h"
 #include "mojo/edk/test/mojo_test_base.h"
 #include "mojo/edk/test/test_utils.h"
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/functions.h"
 #include "mojo/public/c/system/types.h"
 #include "mojo/public/cpp/system/simple_watcher.h"
+#include "mojo/public/cpp/system/wait.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
 namespace mojo {
 namespace edk {
 namespace {
 
 class MultiprocessMessagePipeTest : public test::MojoTestBase {
  protected:
   // Convenience class for tests which will control command-driven children.
@@ skipping 725 matching lines @@
   CloseHandle(p0);
 }
 
 // Receives a pipe handle from the primordial channel and reads new handles
 // from it. Each read handle establishes a new echo channel.
 DEFINE_TEST_CLIENT_WITH_PIPE(EchoServiceFactoryClient,
                              MultiprocessMessagePipeTest, h) {
   MojoHandle p;
   ReadMessageWithHandles(h, &p, 1);
 
-  std::vector<MojoHandle> handles(2);
-  handles[0] = h;
-  handles[1] = p;
+  std::vector<Handle> handles(2);
+  handles[0] = Handle(h);
+  handles[1] = Handle(p);
   std::vector<MojoHandleSignals> signals(2, MOJO_HANDLE_SIGNAL_READABLE);
   for (;;) {
-    uint32_t index;
-    CHECK_EQ(MojoWaitMany(handles.data(), signals.data(),
-                          static_cast<uint32_t>(handles.size()),
-                          MOJO_DEADLINE_INDEFINITE, &index, nullptr),
-             MOJO_RESULT_OK);
+    size_t index;
+    CHECK_EQ(
+        mojo::WaitMany(handles.data(), signals.data(), handles.size(), &index),
+        MOJO_RESULT_OK);
     DCHECK_LE(index, handles.size());
     if (index == 0) {
       // If data is available on the first pipe, it should be an exit command.
       EXPECT_EQ(std::string("exit"), ReadMessage(h));
       break;
     } else if (index == 1) {
       // If the second pipe, it should be a new handle requesting echo service.
       MojoHandle echo_request;
       ReadMessageWithHandles(p, &echo_request, 1);
-      handles.push_back(echo_request);
+      handles.push_back(Handle(echo_request));
       signals.push_back(MOJO_HANDLE_SIGNAL_READABLE);
     } else {
       // Otherwise it was one of our established echo pipes. Echo!
-      WriteMessage(handles[index], ReadMessage(handles[index]));
+      WriteMessage(handles[index].value(), ReadMessage(handles[index].value()));
     }
   }
 
   for (size_t i = 1; i < handles.size(); ++i)
-    CloseHandle(handles[i]);
+    CloseHandle(handles[i].value());
 
   return 0;
 }
 
 TEST_P(MultiprocessMessagePipeTestWithPeerSupport,
        PassMoarMessagePipesCrossProcess) {
   MojoHandle echo_factory_proxy, echo_factory_request;
   CreateMessagePipe(&echo_factory_proxy, &echo_factory_request);
 
   MojoHandle echo_proxy_a, echo_request_a;
@@ skipping 538 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     ,
     MultiprocessMessagePipeTestWithPeerSupport,
     testing::Values(test::MojoTestBase::LaunchType::CHILD,
                     test::MojoTestBase::LaunchType::PEER,
                     test::MojoTestBase::LaunchType::NAMED_CHILD,
                     test::MojoTestBase::LaunchType::NAMED_PEER));
 }  // namespace
 }  // namespace edk
 }  // namespace mojo