Revert of Mojo: Armed Watchers

mojo/edk/system/message_pipe_dispatcher.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_EDK_SYSTEM_MESSAGE_PIPE_DISPATCHER_H_
 #define MOJO_EDK_SYSTEM_MESSAGE_PIPE_DISPATCHER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <queue>
 
 #include "base/macros.h"
 #include "mojo/edk/system/atomic_flag.h"
 #include "mojo/edk/system/awakable_list.h"
 #include "mojo/edk/system/dispatcher.h"
 #include "mojo/edk/system/message_for_transit.h"
 #include "mojo/edk/system/ports/port_ref.h"
-#include "mojo/edk/system/watcher_set.h"
 
 namespace mojo {
 namespace edk {
 
 class NodeController;
 
 class MessagePipeDispatcher : public Dispatcher {
  public:
   // Constructs a MessagePipeDispatcher permanently tied to a specific port.
   // |connected| must indicate the state of the port at construction time; if
@@ skipping 12 matching lines @@
                         int endpoint);
 
   // Fuses this pipe with |other|. Returns |true| on success or |false| on
   // failure. Regardless of the return value, both dispatchers are closed by
   // this call.
   bool Fuse(MessagePipeDispatcher* other);
 
   // 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 WriteMessage(std::unique_ptr<MessageForTransit> message,
                           MojoWriteMessageFlags flags) override;
   MojoResult ReadMessage(std::unique_ptr<MessageForTransit>* message,
                          uint32_t* num_bytes,
                          MojoHandle* handles,
                          uint32_t* num_handles,
                          MojoReadMessageFlags flags,
                          bool read_any_size) 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,
                          HandleSignalsState* signals_state) override;
   void RemoveAwakable(Awakable* awakable,
                       HandleSignalsState* signals_state) override;
   void StartSerialize(uint32_t* num_bytes,
                       uint32_t* num_ports,
                       uint32_t* num_handles) override;
   bool EndSerialize(void* destination,
@@ skipping 30 matching lines @@
   // Guards access to all the fields below.
   mutable base::Lock signal_lock_;
 
   // This is not the same is |port_transferred_|. It's only held true between
   // BeginTransit() and Complete/CancelTransit().
   AtomicFlag in_transit_;
 
   bool port_transferred_ = false;
   AtomicFlag port_closed_;
   AwakableList awakables_;
-  WatcherSet watchers_;
 
   DISALLOW_COPY_AND_ASSIGN(MessagePipeDispatcher);
 };
 
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_MESSAGE_PIPE_DISPATCHER_H_