Revert of Mojo: Armed Watchers

third_party/WebKit/Source/core/mojo/MojoWatcher.h

Index: third_party/WebKit/Source/core/mojo/MojoWatcher.h
diff --git a/third_party/WebKit/Source/core/mojo/MojoWatcher.h b/third_party/WebKit/Source/core/mojo/MojoWatcher.h
index 99671de82cb13390c01f5df91885d63ea9b5d18f..fe6e193d1a500872e08a14d49aeb186f3813b5a2 100644
--- a/third_party/WebKit/Source/core/mojo/MojoWatcher.h
+++ b/third_party/WebKit/Source/core/mojo/MojoWatcher.h
@@ -10,7 +10,6 @@
 #include "bindings/core/v8/TraceWrapperMember.h"
 #include "core/dom/ContextLifecycleObserver.h"
 #include "mojo/public/cpp/system/handle.h"
-#include "mojo/public/cpp/system/watcher.h"
 
 namespace blink {
 
@@ -48,17 +47,15 @@
 
   MojoWatcher(ExecutionContext*, MojoWatchCallback*);
   MojoResult watch(mojo::Handle, const MojoHandleSignals&);
-  MojoResult arm(MojoResult* readyResult);
 
   static void onHandleReady(uintptr_t context,
                             MojoResult,
                             MojoHandleSignalsState,
-                            MojoWatcherNotificationFlags);
+                            MojoWatchNotificationFlags);
   void runReadyCallback(MojoResult);
 
   RefPtr<WebTaskRunner> m_taskRunner;
   TraceWrapperMember<MojoWatchCallback> m_callback;
-  mojo::ScopedWatcherHandle m_watcherHandle;
   mojo::Handle m_handle;
 };