Revert of Mojo: Armed Watchers

media/remoting/demuxer_stream_adapter.h

Index: media/remoting/demuxer_stream_adapter.h
diff --git a/media/remoting/demuxer_stream_adapter.h b/media/remoting/demuxer_stream_adapter.h
index 350ad66517ba56596aae46dad54c322ae1026d9b..141fe8e336ba0193462268b30e34dc090918fb51 100644
--- a/media/remoting/demuxer_stream_adapter.h
+++ b/media/remoting/demuxer_stream_adapter.h
@@ -21,7 +21,6 @@
 #include "media/remoting/rpc_broker.h"
 #include "media/remoting/triggers.h"
 #include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/public/cpp/system/simple_watcher.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -168,7 +167,7 @@
   bool pending_frame_is_eos_;
 
   // Monitor if data pipe is available to write data.
-  mojo::SimpleWatcher write_watcher_;
+  mojo::Watcher write_watcher_;
 
   // Keeps latest demuxer stream status and audio/video decoder config.
   DemuxerStream::Status media_status_;