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 d6bfd95d1741c3b65581ca4a5818effc905673a3..c8a25be9cb657a3b09e58e63a7996e204cb0a2f8 100644
--- a/mojo/public/c/system/thunks.cc
+++ b/mojo/public/c/system/thunks.cc
@@ -185,17 +185,22 @@ MojoResult MojoGetReadyHandles(MojoHandle wait_set,
                                   signals_states);
 }
 
-MojoResult MojoWatch(MojoHandle handle,
-                     MojoHandleSignals signals,
-                     MojoWatchCallback callback,
-                     uintptr_t context) {
-  assert(g_thunks.Watch);
-  return g_thunks.Watch(handle, signals, callback, context);
+MojoResult MojoRegisterWatcher(MojoHandle handle,
+                               MojoHandleSignals signals,
+                               MojoWatchCallback callback,
+                               uintptr_t context) {
+  assert(g_thunks.RegisterWatcher);
+  return g_thunks.RegisterWatcher(handle, signals, callback, context);
 }
 
-MojoResult MojoCancelWatch(MojoHandle handle, uintptr_t context) {
-  assert(g_thunks.CancelWatch);
-  return g_thunks.CancelWatch(handle, context);
+MojoResult MojoArmWatcher(MojoHandle handle, uintptr_t context) {
+  assert(g_thunks.ArmWatcher);
+  return g_thunks.ArmWatcher(handle, context);
+}
+
+MojoResult MojoUnregisterWatcher(MojoHandle handle, uintptr_t context) {
+  assert(g_thunks.UnregisterWatcher);
+  return g_thunks.UnregisterWatcher(handle, context);
 }
 
 MojoResult MojoFuseMessagePipes(MojoHandle handle0, MojoHandle handle1) {