Revert of Mojo: Armed Watchers

mojo/edk/system/dispatcher.cc

 // Copyright 2013 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.
 
 #include "mojo/edk/system/dispatcher.h"
 
 #include "base/logging.h"
 #include "mojo/edk/system/configuration.h"
 #include "mojo/edk/system/data_pipe_consumer_dispatcher.h"
 #include "mojo/edk/system/data_pipe_producer_dispatcher.h"
 #include "mojo/edk/system/message_pipe_dispatcher.h"
 #include "mojo/edk/system/platform_handle_dispatcher.h"
 #include "mojo/edk/system/shared_buffer_dispatcher.h"
 
 namespace mojo {
 namespace edk {
 
 Dispatcher::DispatcherInTransit::DispatcherInTransit() {}
 
 Dispatcher::DispatcherInTransit::DispatcherInTransit(
     const DispatcherInTransit& other) = default;
 
 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;
-}
-
 MojoResult Dispatcher::WriteMessage(std::unique_ptr<MessageForTransit> message,
                                     MojoWriteMessageFlags flags) {
   return MOJO_RESULT_INVALID_ARGUMENT;
 }
 
 MojoResult Dispatcher::ReadMessage(std::unique_ptr<MessageForTransit>* message,
                                    uint32_t* num_bytes,
                                    MojoHandle* handles,
                                    uint32_t* num_handles,
                                    MojoReadMessageFlags flags,
@@ skipping 63 matching lines @@
                                            DispatcherVector* dispatchers,
                                            MojoResult* results,
                                            uintptr_t* contexts) {
   return MOJO_RESULT_INVALID_ARGUMENT;
 }
 
 HandleSignalsState Dispatcher::GetHandleSignalsState() const {
   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,
                                    HandleSignalsState* signals_state) {
   return MOJO_RESULT_INVALID_ARGUMENT;
 }
 
 void Dispatcher::RemoveAwakable(Awakable* awakable,
                                 HandleSignalsState* handle_signals_state) {
   NOTREACHED();
@@ skipping 55 matching lines @@
       return nullptr;
   }
 }
 
 Dispatcher::Dispatcher() {}
 
 Dispatcher::~Dispatcher() {}
 
 }  // namespace edk
 }  // namespace mojo