Revert of Mojo: Armed Watchers

mojo/edk/system/dispatcher.cc

Index: mojo/edk/system/dispatcher.cc
diff --git a/mojo/edk/system/dispatcher.cc b/mojo/edk/system/dispatcher.cc
index 97e87e06824e256361ebbdd55b443b0d3340ddfe..7d701b244280f7a85b2aea67cfb7a880c0a0184c 100644
--- a/mojo/edk/system/dispatcher.cc
+++ b/mojo/edk/system/dispatcher.cc
@@ -22,20 +22,13 @@
 
 Dispatcher::DispatcherInTransit::~DispatcherInTransit() {}
 
-MojoResult Dispatcher::WatchDispatcher(scoped_refptr<Dispatcher> dispatcher,
-                                       MojoHandleSignals signals,
-                                       uintptr_t context) {
+MojoResult Dispatcher::Watch(MojoHandleSignals signals,
+                             const Watcher::WatchCallback& callback,
+                             uintptr_t context) {
   return MOJO_RESULT_INVALID_ARGUMENT;
 }
 
 MojoResult Dispatcher::CancelWatch(uintptr_t context) {
-  return MOJO_RESULT_INVALID_ARGUMENT;
-}
-
-MojoResult Dispatcher::Arm(uint32_t* num_ready_contexts,
-                           uintptr_t* ready_contexts,
-                           MojoResult* ready_results,
-                           MojoHandleSignalsState* ready_signals_states) {
   return MOJO_RESULT_INVALID_ARGUMENT;
 }
 
@@ -122,17 +115,6 @@
   return HandleSignalsState();
 }
 
-MojoResult Dispatcher::AddWatcherRef(
-    const scoped_refptr<WatcherDispatcher>& watcher,
-    uintptr_t context) {
-  return MOJO_RESULT_INVALID_ARGUMENT;
-}
-
-MojoResult Dispatcher::RemoveWatcherRef(WatcherDispatcher* watcher,
-                                        uintptr_t context) {
-  return MOJO_RESULT_INVALID_ARGUMENT;
-}
-
 MojoResult Dispatcher::AddAwakable(Awakable* awakable,
                                    MojoHandleSignals signals,
                                    uintptr_t context,