Revert of Mojo: Armed Watchers

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 ecf163061f5970d5d74965d1b162debef1499ada..f09c5e149f65062545f118f85af1e625c53c3f61 100644
--- a/mojo/edk/embedder/entrypoints.cc
+++ b/mojo/edk/embedder/entrypoints.cc
@@ -45,29 +45,15 @@
                           signals_states);
 }
 
-MojoResult MojoCreateWatcherImpl(MojoWatcherCallback callback,
-                                 MojoHandle* watcher_handle) {
-  return g_core->CreateWatcher(callback, watcher_handle);
-}
-
-MojoResult MojoArmWatcherImpl(MojoHandle watcher_handle,
-                              uint32_t* num_ready_contexts,
-                              uintptr_t* ready_contexts,
-                              MojoResult* ready_results,
-                              MojoHandleSignalsState* ready_signals_states) {
-  return g_core->ArmWatcher(watcher_handle, num_ready_contexts, ready_contexts,
-                            ready_results, ready_signals_states);
-}
-
-MojoResult MojoWatchImpl(MojoHandle watcher_handle,
-                         MojoHandle handle,
+MojoResult MojoWatchImpl(MojoHandle handle,
                          MojoHandleSignals signals,
+                         MojoWatchCallback callback,
                          uintptr_t context) {
-  return g_core->Watch(watcher_handle, handle, signals, context);
-}
-
-MojoResult MojoCancelWatchImpl(MojoHandle watcher_handle, uintptr_t context) {
-  return g_core->CancelWatch(watcher_handle, context);
+  return g_core->Watch(handle, signals, callback, context);
+}
+
+MojoResult MojoCancelWatchImpl(MojoHandle handle, uintptr_t context) {
+  return g_core->CancelWatch(handle, context);
 }
 
 MojoResult MojoAllocMessageImpl(uint32_t num_bytes,
@@ -301,10 +287,8 @@
                                     MojoAddHandleImpl,
                                     MojoRemoveHandleImpl,
                                     MojoGetReadyHandlesImpl,
-                                    MojoCreateWatcherImpl,
                                     MojoWatchImpl,
                                     MojoCancelWatchImpl,
-                                    MojoArmWatcherImpl,
                                     MojoFuseMessagePipesImpl,
                                     MojoWriteMessageNewImpl,
                                     MojoReadMessageNewImpl,