Mojo: Armed Watchers

mojo/edk/system/core.h

Index: mojo/edk/system/core.h
diff --git a/mojo/edk/system/core.h b/mojo/edk/system/core.h
index db2e8cfdaa66dcf1483d8bb45bc2ac676f8ee219..e4fe7bc80ca78e348e97e78692cb714da959ebbb 100644
--- a/mojo/edk/system/core.h
+++ b/mojo/edk/system/core.h
@@ -145,11 +145,12 @@ class MOJO_SYSTEM_IMPL_EXPORT Core {
                       MojoDeadline deadline,
                       uint32_t* result_index,
                       MojoHandleSignalsState* signals_states);
-  MojoResult Watch(MojoHandle handle,
-                   MojoHandleSignals signals,
-                   MojoWatchCallback callback,
-                   uintptr_t context);
-  MojoResult CancelWatch(MojoHandle handle, uintptr_t context);
+  MojoResult RegisterWatcher(MojoHandle handle,
+                             MojoHandleSignals signals,
+                             MojoWatchCallback callback,
+                             uintptr_t context);
+  MojoResult ArmWatcher(MojoHandle handle, uintptr_t context);
+  MojoResult UnregisterWatcher(MojoHandle handle, uintptr_t context);
   MojoResult AllocMessage(uint32_t num_bytes,
                           const MojoHandle* handles,
                           uint32_t num_handles,