Revert of Mojo: Armed Watchers

mojo/edk/system/data_pipe_consumer_dispatcher.h

Index: mojo/edk/system/data_pipe_consumer_dispatcher.h
diff --git a/mojo/edk/system/data_pipe_consumer_dispatcher.h b/mojo/edk/system/data_pipe_consumer_dispatcher.h
index 26ceadf22146f44e25186ada18eae3c115330863..b323c16d83f3bcfaa930b981b1824b205061b279 100644
--- a/mojo/edk/system/data_pipe_consumer_dispatcher.h
+++ b/mojo/edk/system/data_pipe_consumer_dispatcher.h
@@ -20,7 +20,6 @@
 #include "mojo/edk/system/dispatcher.h"
 #include "mojo/edk/system/ports/port_ref.h"
 #include "mojo/edk/system/system_impl_export.h"
-#include "mojo/edk/system/watcher_set.h"
 
 namespace mojo {
 namespace edk {
@@ -44,6 +43,10 @@
   // Dispatcher:
   Type GetType() const override;
   MojoResult Close() override;
+  MojoResult Watch(MojoHandleSignals signals,
+                   const Watcher::WatchCallback& callback,
+                   uintptr_t context) override;
+  MojoResult CancelWatch(uintptr_t context) override;
   MojoResult ReadData(void* elements,
                       uint32_t* num_bytes,
                       MojoReadDataFlags flags) override;
@@ -52,10 +55,6 @@
                            MojoReadDataFlags flags) override;
   MojoResult EndReadData(uint32_t num_bytes_read) override;
   HandleSignalsState GetHandleSignalsState() const override;
-  MojoResult AddWatcherRef(const scoped_refptr<WatcherDispatcher>& watcher,
-                           uintptr_t context) override;
-  MojoResult RemoveWatcherRef(WatcherDispatcher* watcher,
-                              uintptr_t context) override;
   MojoResult AddAwakable(Awakable* awakable,
                          MojoHandleSignals signals,
                          uintptr_t context,
@@ -102,7 +101,6 @@
   mutable base::Lock lock_;
 
   AwakableList awakable_list_;
-  WatcherSet watchers_;
 
   scoped_refptr<PlatformSharedBuffer> shared_ring_buffer_;
   std::unique_ptr<PlatformSharedBufferMapping> ring_buffer_mapping_;