Revert of Mojo: Armed Watchers

media/remoting/demuxer_stream_adapter.h

 // Copyright 2016 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.
 
 #ifndef MEDIA_REMOTING_DEMUXER_STREAM_ADAPTER_H_
 #define MEDIA_REMOTING_DEMUXER_STREAM_ADAPTER_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/video_decoder_config.h"
 #include "media/mojo/interfaces/remoting.mojom.h"
 #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;
 }
 
 namespace media {
 
 class DemuxerStream;
 
 namespace remoting {
@@ skipping 126 matching lines @@
   // aborted and data should be discarded when the value is true.
   bool pending_flush_;
 
   // Frame buffer and its information that is currently in process of writing to
   // Mojo data pipe.
   std::vector<uint8_t> pending_frame_;
   uint32_t current_pending_frame_offset_;
   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_;
   AudioDecoderConfig audio_config_;
   VideoDecoderConfig video_config_;
 
   mojom::RemotingDataStreamSenderPtr stream_sender_;
   mojo::ScopedDataPipeProducerHandle producer_handle_;
 
   // Tracks the number of bytes written to the pipe.
   int64_t bytes_written_to_pipe_;
 
   // WeakPtrFactory only for reading buffer from demuxer stream. This is used
   // for canceling all read callbacks provided to the |demuxer_stream_| before a
   // flush.
   base::WeakPtrFactory<DemuxerStreamAdapter> request_buffer_weak_factory_;
   // WeakPtrFactory for normal usage.
   base::WeakPtrFactory<DemuxerStreamAdapter> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DemuxerStreamAdapter);
 };
 
 }  // namespace remoting
 }  // namespace media
 
 #endif  // MEDIA_REMOTING_DEMUXER_STREAM_ADAPTER_H_