Revert of Mojo: Armed Watchers

mojo/public/c/system/thunks.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/public/c/system/thunks.h"
 
 #include <assert.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 167 matching lines @@
 MojoResult MojoGetReadyHandles(MojoHandle wait_set,
                                uint32_t* count,
                                MojoHandle* handles,
                                MojoResult* results,
                                struct MojoHandleSignalsState* signals_states) {
   assert(g_thunks.GetReadyHandles);
   return g_thunks.GetReadyHandles(wait_set, count, handles, results,
                                   signals_states);
 }
 
-MojoResult MojoCreateWatcher(MojoWatcherCallback callback,
-                             MojoHandle* watcher_handle) {
-  assert(g_thunks.CreateWatcher);
-  return g_thunks.CreateWatcher(callback, watcher_handle);
+MojoResult MojoWatch(MojoHandle handle,
+                     MojoHandleSignals signals,
+                     MojoWatchCallback callback,
+                     uintptr_t context) {
+  assert(g_thunks.Watch);
+  return g_thunks.Watch(handle, signals, callback, context);
 }
 
-MojoResult MojoWatch(MojoHandle watcher_handle,
-                     MojoHandle handle,
-                     MojoHandleSignals signals,
-                     uintptr_t context) {
-  assert(g_thunks.Watch);
-  return g_thunks.Watch(watcher_handle, handle, signals, context);
-}
-
-MojoResult MojoCancelWatch(MojoHandle watcher_handle, uintptr_t context) {
+MojoResult MojoCancelWatch(MojoHandle handle, uintptr_t context) {
   assert(g_thunks.CancelWatch);
-  return g_thunks.CancelWatch(watcher_handle, context);
-}
-
-MojoResult MojoArmWatcher(MojoHandle watcher_handle,
-                          uint32_t* num_ready_contexts,
-                          uintptr_t* ready_contexts,
-                          MojoResult* ready_results,
-                          MojoHandleSignalsState* ready_signals_states) {
-  assert(g_thunks.ArmWatcher);
-  return g_thunks.ArmWatcher(watcher_handle, num_ready_contexts, ready_contexts,
-                             ready_results, ready_signals_states);
+  return g_thunks.CancelWatch(handle, context);
 }
 
 MojoResult MojoFuseMessagePipes(MojoHandle handle0, MojoHandle handle1) {
   assert(g_thunks.FuseMessagePipes);
   return g_thunks.FuseMessagePipes(handle0, handle1);
 }
 
 MojoResult MojoWriteMessageNew(MojoHandle message_pipe_handle,
                                MojoMessageHandle message,
                                MojoWriteMessageFlags flags) {
@@ skipping 78 matching lines @@
   return g_thunks.GetProperty(type, value);
 }
 
 }  // extern "C"
 
 size_t MojoEmbedderSetSystemThunks(const MojoSystemThunks* system_thunks) {
   if (system_thunks->size >= sizeof(g_thunks))
     g_thunks = *system_thunks;
   return sizeof(g_thunks);
 }