Revert of Mojo: Armed Watchers

mojo/edk/system/watcher_set.h

Index: mojo/edk/system/watcher_set.h
diff --git a/mojo/edk/system/watcher_set.h b/mojo/edk/system/watcher_set.h
index 2b7ef2c5ac1050b9c00bbf3c97468715754525f7..8ae54a1b35270faf5d3fe8fc3b753764623362c1 100644
--- a/mojo/edk/system/watcher_set.h
+++ b/mojo/edk/system/watcher_set.h
@@ -5,62 +5,45 @@
 #ifndef MOJO_EDK_SYSTEM_WATCHER_SET_H_
 #define MOJO_EDK_SYSTEM_WATCHER_SET_H_
 
-#include <map>
+#include <unordered_map>
 
+#include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/optional.h"
 #include "mojo/edk/system/handle_signals_state.h"
-#include "mojo/edk/system/watcher_dispatcher.h"
+#include "mojo/edk/system/watcher.h"
+#include "mojo/public/c/system/types.h"
 
 namespace mojo {
 namespace edk {
 
-// A WatcherSet maintains a set of references to WatcherDispatchers to be
-// notified when a handle changes state.
-//
-// Dispatchers which may be watched by a watcher should own a WatcherSet and
-// notify it of all relevant state changes.
+// A WatcherSet maintains a set of Watchers attached to a single handle and
+// keyed on an arbitrary user context.
 class WatcherSet {
  public:
-  // |owner| is the Dispatcher who owns this WatcherSet.
-  explicit WatcherSet(Dispatcher* owner);
+  WatcherSet();
   ~WatcherSet();
 
-  // Notifies all watchers of the handle's current signals state.
-  void NotifyState(const HandleSignalsState& state);
+  // Notifies all Watchers of a state change.
+  void NotifyForStateChange(const HandleSignalsState& state);
 
-  // Notifies all watchers that this handle has been closed.
+  // Notifies all Watchers that their watched handle has been closed.
   void NotifyClosed();
 
-  // Adds a new watcher+context.
-  MojoResult Add(const scoped_refptr<WatcherDispatcher>& watcher,
+  // Adds a new watcher to watch for signals in |signals| to be satisfied or
+  // unsatisfiable. |current_state| is the current signals state of the
+  // handle being watched.
+  MojoResult Add(MojoHandleSignals signals,
+                 const Watcher::WatchCallback& callback,
                  uintptr_t context,
                  const HandleSignalsState& current_state);
 
-  // Removes a watcher+context.
-  MojoResult Remove(WatcherDispatcher* watcher, uintptr_t context);
+  // Removes a watcher from the set.
+  MojoResult Remove(uintptr_t context);
 
  private:
-  using ContextSet = std::set<uintptr_t>;
-
-  struct Entry {
-    Entry(const scoped_refptr<WatcherDispatcher>& dispatcher);
-    Entry(Entry&& other);
-    ~Entry();
-
-    Entry& operator=(Entry&& other);
-
-    scoped_refptr<WatcherDispatcher> dispatcher;
-    ContextSet contexts;
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(Entry);
-  };
-
-  Dispatcher* const owner_;
-  std::map<WatcherDispatcher*, Entry> watchers_;
-  base::Optional<HandleSignalsState> last_known_state_;
+  // A map of watchers keyed on context value.
+  std::unordered_map<uintptr_t, scoped_refptr<Watcher>> watchers_;
 
   DISALLOW_COPY_AND_ASSIGN(WatcherSet);
 };