Revert of Mojo: Armed Watchers

mojo/public/c/system/thunks.cc

Index: mojo/public/c/system/thunks.cc
diff --git a/mojo/public/c/system/thunks.cc b/mojo/public/c/system/thunks.cc
index 1e92954a51c30b21bbde49c334aca6557896e727..d6bfd95d1741c3b65581ca4a5818effc905673a3 100644
--- a/mojo/public/c/system/thunks.cc
+++ b/mojo/public/c/system/thunks.cc
@@ -185,33 +185,17 @@
                                   signals_states);
 }
 
-MojoResult MojoCreateWatcher(MojoWatcherCallback callback,
-                             MojoHandle* watcher_handle) {
-  assert(g_thunks.CreateWatcher);
-  return g_thunks.CreateWatcher(callback, watcher_handle);
-}
-
-MojoResult MojoWatch(MojoHandle watcher_handle,
-                     MojoHandle handle,
+MojoResult MojoWatch(MojoHandle handle,
                      MojoHandleSignals signals,
+                     MojoWatchCallback callback,
                      uintptr_t context) {
   assert(g_thunks.Watch);
-  return g_thunks.Watch(watcher_handle, handle, signals, context);
-}
-
-MojoResult MojoCancelWatch(MojoHandle watcher_handle, uintptr_t context) {
+  return g_thunks.Watch(handle, signals, callback, context);
+}
+
+MojoResult MojoCancelWatch(MojoHandle handle, uintptr_t context) {
   assert(g_thunks.CancelWatch);
-  return g_thunks.CancelWatch(watcher_handle, context);
-}
-
-MojoResult MojoArmWatcher(MojoHandle watcher_handle,
-                          uint32_t* num_ready_contexts,
-                          uintptr_t* ready_contexts,
-                          MojoResult* ready_results,
-                          MojoHandleSignalsState* ready_signals_states) {
-  assert(g_thunks.ArmWatcher);
-  return g_thunks.ArmWatcher(watcher_handle, num_ready_contexts, ready_contexts,
-                             ready_results, ready_signals_states);
+  return g_thunks.CancelWatch(handle, context);
 }
 
 MojoResult MojoFuseMessagePipes(MojoHandle handle0, MojoHandle handle1) {