Mojo: Move waiting APIs to public library

mojo/edk/embedder/entrypoints.cc

Index: mojo/edk/embedder/entrypoints.cc
diff --git a/mojo/edk/embedder/entrypoints.cc b/mojo/edk/embedder/entrypoints.cc
index 5c149d969f57b080a71f09e8ece6ce02a064d1dc..908136855068fe880509df9812568bc81cbf63b4 100644
--- a/mojo/edk/embedder/entrypoints.cc
+++ b/mojo/edk/embedder/entrypoints.cc
@@ -13,7 +13,6 @@
 #include "mojo/public/c/system/functions.h"
 #include "mojo/public/c/system/message_pipe.h"
 #include "mojo/public/c/system/platform_handle.h"
-#include "mojo/public/c/system/wait_set.h"
 
 using mojo::edk::internal::g_core;
 
@@ -34,23 +33,6 @@ MojoResult MojoQueryHandleSignalsStateImpl(
   return g_core->QueryHandleSignalsState(handle, signals_state);
 }
 
-MojoResult MojoWaitImpl(MojoHandle handle,
-                        MojoHandleSignals signals,
-                        MojoDeadline deadline,
-                        MojoHandleSignalsState* signals_state) {
-  return g_core->Wait(handle, signals, deadline, signals_state);
-}
-
-MojoResult MojoWaitManyImpl(const MojoHandle* handles,
-                            const MojoHandleSignals* signals,
-                            uint32_t num_handles,
-                            MojoDeadline deadline,
-                            uint32_t* result_index,
-                            MojoHandleSignalsState* signals_states) {
-  return g_core->WaitMany(handles, signals, num_handles, deadline, result_index,
-                          signals_states);
-}
-
 MojoResult MojoCreateWatcherImpl(MojoWatcherCallback callback,
                                  MojoHandle* watcher_handle) {
   return g_core->CreateWatcher(callback, watcher_handle);
@@ -92,30 +74,6 @@ MojoResult MojoGetMessageBufferImpl(MojoMessageHandle message, void** buffer) {
   return g_core->GetMessageBuffer(message, buffer);
 }
 
-MojoResult MojoCreateWaitSetImpl(MojoHandle* wait_set_handle) {
-  return g_core->CreateWaitSet(wait_set_handle);
-}
-
-MojoResult MojoAddHandleImpl(MojoHandle wait_set_handle,
-                             MojoHandle handle,
-                             MojoHandleSignals signals) {
-  return g_core->AddHandle(wait_set_handle, handle, signals);
-}
-
-MojoResult MojoRemoveHandleImpl(MojoHandle wait_set_handle, MojoHandle handle) {
-  return g_core->RemoveHandle(wait_set_handle, handle);
-}
-
-MojoResult MojoGetReadyHandlesImpl(
-    MojoHandle wait_set_handle,
-    uint32_t* count,
-    MojoHandle* handles,
-    MojoResult* results,
-    struct MojoHandleSignalsState* signals_states) {
-  return g_core->GetReadyHandles(wait_set_handle, count, handles, results,
-                                 signals_states);
-}
-
 MojoResult MojoCreateMessagePipeImpl(
     const MojoCreateMessagePipeOptions* options,
     MojoHandle* message_pipe_handle0,
@@ -288,8 +246,6 @@ MojoSystemThunks MakeSystemThunks() {
                                     MojoGetTimeTicksNowImpl,
                                     MojoCloseImpl,
                                     MojoQueryHandleSignalsStateImpl,
-                                    MojoWaitImpl,
-                                    MojoWaitManyImpl,
                                     MojoCreateMessagePipeImpl,
                                     MojoWriteMessageImpl,
                                     MojoReadMessageImpl,
@@ -304,10 +260,6 @@ MojoSystemThunks MakeSystemThunks() {
                                     MojoDuplicateBufferHandleImpl,
                                     MojoMapBufferImpl,
                                     MojoUnmapBufferImpl,
-                                    MojoCreateWaitSetImpl,
-                                    MojoAddHandleImpl,
-                                    MojoRemoveHandleImpl,
-                                    MojoGetReadyHandlesImpl,
                                     MojoCreateWatcherImpl,
                                     MojoWatchImpl,
                                     MojoCancelWatchImpl,