Revert of Mojo: Armed Watchers

mojo/edk/embedder/entrypoints.cc

 // Copyright 2014 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/embedder/entrypoints.h"
 
 #include <stdint.h>
 
 #include "mojo/edk/embedder/embedder_internal.h"
 #include "mojo/edk/system/core.h"
@@ skipping 27 matching lines @@
 MojoResult MojoWaitManyImpl(const MojoHandle* handles,
                             const MojoHandleSignals* signals,
                             uint32_t num_handles,
                             MojoDeadline deadline,
                             uint32_t* result_index,
                             MojoHandleSignalsState* signals_states) {
   return g_core->WaitMany(handles, signals, num_handles, deadline, result_index,
                           signals_states);
 }
 
-MojoResult MojoCreateWatcherImpl(MojoWatcherCallback callback,
-                                 MojoHandle* watcher_handle) {
-  return g_core->CreateWatcher(callback, watcher_handle);
+MojoResult MojoWatchImpl(MojoHandle handle,
+                         MojoHandleSignals signals,
+                         MojoWatchCallback callback,
+                         uintptr_t context) {
+  return g_core->Watch(handle, signals, callback, context);
 }
 
-MojoResult MojoArmWatcherImpl(MojoHandle watcher_handle,
-                              uint32_t* num_ready_contexts,
-                              uintptr_t* ready_contexts,
-                              MojoResult* ready_results,
-                              MojoHandleSignalsState* ready_signals_states) {
-  return g_core->ArmWatcher(watcher_handle, num_ready_contexts, ready_contexts,
-                            ready_results, ready_signals_states);
-}
-
-MojoResult MojoWatchImpl(MojoHandle watcher_handle,
-                         MojoHandle handle,
-                         MojoHandleSignals signals,
-                         uintptr_t context) {
-  return g_core->Watch(watcher_handle, handle, signals, context);
-}
-
-MojoResult MojoCancelWatchImpl(MojoHandle watcher_handle, uintptr_t context) {
-  return g_core->CancelWatch(watcher_handle, context);
+MojoResult MojoCancelWatchImpl(MojoHandle handle, uintptr_t context) {
+  return g_core->CancelWatch(handle, context);
 }
 
 MojoResult MojoAllocMessageImpl(uint32_t num_bytes,
                                 const MojoHandle* handles,
                                 uint32_t num_handles,
                                 MojoAllocMessageFlags flags,
                                 MojoMessageHandle* message) {
   return g_core->AllocMessage(num_bytes, handles, num_handles, flags, message);
 }
 
@@ skipping 213 matching lines @@
                                     MojoBeginReadDataImpl,
                                     MojoEndReadDataImpl,
                                     MojoCreateSharedBufferImpl,
                                     MojoDuplicateBufferHandleImpl,
                                     MojoMapBufferImpl,
                                     MojoUnmapBufferImpl,
                                     MojoCreateWaitSetImpl,
                                     MojoAddHandleImpl,
                                     MojoRemoveHandleImpl,
                                     MojoGetReadyHandlesImpl,
-                                    MojoCreateWatcherImpl,
                                     MojoWatchImpl,
                                     MojoCancelWatchImpl,
-                                    MojoArmWatcherImpl,
                                     MojoFuseMessagePipesImpl,
                                     MojoWriteMessageNewImpl,
                                     MojoReadMessageNewImpl,
                                     MojoAllocMessageImpl,
                                     MojoFreeMessageImpl,
                                     MojoGetMessageBufferImpl,
                                     MojoWrapPlatformHandleImpl,
                                     MojoUnwrapPlatformHandleImpl,
                                     MojoWrapPlatformSharedBufferHandleImpl,
                                     MojoUnwrapPlatformSharedBufferHandleImpl,
                                     MojoNotifyBadMessageImpl,
                                     MojoGetPropertyImpl};
   return system_thunks;
 }
 
 }  // namespace edk
 }  // namespace mojo