media: Add MojoDecoderBuffer{Reader|Writer}

media/mojo/services/mojo_demuxer_stream_adapter.h

Index: media/mojo/services/mojo_demuxer_stream_adapter.h
diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.h b/media/mojo/services/mojo_demuxer_stream_adapter.h
index 5422f5590bc8fe729dbbcfed8c4215fddf20bcb3..b97086d0fb20c2a5099d2bed3dd39eb0ecfeb322 100644
--- a/media/mojo/services/mojo_demuxer_stream_adapter.h
+++ b/media/mojo/services/mojo_demuxer_stream_adapter.h
@@ -5,6 +5,7 @@
 #ifndef MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_ADAPTER_H_
 #define MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_ADAPTER_H_
 
+#include <memory>
 #include <queue>
 
 #include "base/macros.h"
@@ -16,6 +17,8 @@
 
 namespace media {
 
+class MojoDecoderBufferReader;
+
 // This class acts as a MojoRendererService-side stub for a real DemuxerStream
 // that is part of a Pipeline in a remote application. Roughly speaking, it
 // takes a mojom::DemuxerStreamPtr and exposes it as a DemuxerStream for
@@ -44,7 +47,7 @@ class MojoDemuxerStreamAdapter : public DemuxerStream {
 
  private:
   void OnStreamReady(mojom::DemuxerStream::Type type,
-                     mojo::ScopedDataPipeConsumerHandle pipe,
+                     mojo::ScopedDataPipeConsumerHandle consumer_handle,
                      mojom::AudioDecoderConfigPtr audio_config,
                      mojom::VideoDecoderConfigPtr video_config);
 
@@ -75,8 +78,7 @@ class MojoDemuxerStreamAdapter : public DemuxerStream {
 
   DemuxerStream::Type type_;
 
-  // DataPipe for deserializing the data section of DecoderBuffers from.
-  mojo::ScopedDataPipeConsumerHandle stream_pipe_;
+  std::unique_ptr<MojoDecoderBufferReader> mojo_decoder_buffer_reader_;
 
   base::WeakPtrFactory<MojoDemuxerStreamAdapter> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(MojoDemuxerStreamAdapter);