EDK: wait sets: Implement WaitSetDispatcher::WaitSet{AddRemove}Impl().

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 7d9741af920030dce0168643a7d23c77743ad996..2c9ade3c3a341622040e31d986eb63fe52ca93d0 100644
--- a/mojo/edk/system/dispatcher.cc
+++ b/mojo/edk/system/dispatcher.cc
@@ -112,8 +112,7 @@ MojoResult Dispatcher::Close() {
   return MOJO_RESULT_OK;
 }
 
-MojoResult Dispatcher::DuplicateDispatcher(
-    util::RefPtr<Dispatcher>* new_dispatcher) {
+MojoResult Dispatcher::DuplicateDispatcher(RefPtr<Dispatcher>* new_dispatcher) {
   MutexLocker locker(&mutex_);
   if (is_closed_)
     return MOJO_RESULT_INVALID_ARGUMENT;
@@ -281,10 +280,10 @@ MojoResult Dispatcher::MapBuffer(
 // virtual, but we prefer to have a separate "impl" methods for consistency.)
 MojoResult Dispatcher::WaitSetAdd(
     UserPointer<const MojoWaitSetAddOptions> options,
-    Handle&& handle,
+    RefPtr<Dispatcher>&& dispatcher,
     MojoHandleSignals signals,
     uint64_t cookie) {
-  return WaitSetAddImpl(options, std::move(handle), signals, cookie);
+  return WaitSetAddImpl(options, std::move(dispatcher), signals, cookie);
 }
 
 MojoResult Dispatcher::WaitSetRemove(uint64_t cookie) {
@@ -383,7 +382,7 @@ void Dispatcher::CloseImplNoLock() {
 }
 
 MojoResult Dispatcher::DuplicateDispatcherImplNoLock(
-    util::RefPtr<Dispatcher>* new_dispatcher) {
+    RefPtr<Dispatcher>* new_dispatcher) {
   mutex_.AssertHeld();
   DCHECK(!is_closed_);
   // By default, this is not supported. However, this should only be reachable
@@ -538,7 +537,7 @@ MojoResult Dispatcher::MapBufferImplNoLock(
 // |mutex_| and check |is_closed_|.
 MojoResult Dispatcher::WaitSetAddImpl(
     UserPointer<const MojoWaitSetAddOptions> /*options*/,
-    Handle&& /*handle*/,
+    RefPtr<Dispatcher>&& /*dispatcher*/,
     MojoHandleSignals /*signals*/,
     uint64_t /*cookie*/) {
   // See note above.