media: Use native DemuxerStream enum types in media mojo interfaces

media/mojo/services/mojo_demuxer_stream_adapter.h

 // Copyright 2014 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_MOJO_SERVICES_MOJO_DEMUXER_STREAM_ADAPTER_H_
 #define MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_ADAPTER_H_
 
 #include <memory>
 #include <queue>
 
@@ skipping 31 matching lines @@
   VideoDecoderConfig video_decoder_config() override;
   Type type() const override;
   void EnableBitstreamConverter() override;
   bool SupportsConfigChanges() override;
   VideoRotation video_rotation() override;
   bool enabled() const override;
   void set_enabled(bool enabled, base::TimeDelta timestamp) override;
   void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb) override;
 
  private:
-  void OnStreamReady(mojom::DemuxerStream::Type type,
+  void OnStreamReady(Type type,
                      mojo::ScopedDataPipeConsumerHandle consumer_handle,
                      mojom::AudioDecoderConfigPtr audio_config,
                      mojom::VideoDecoderConfigPtr video_config);
 
   // The callback from |demuxer_stream_| that a read operation has completed.
   // |read_cb| is a callback from the client who invoked Read() on |this|.
-  void OnBufferReady(mojom::DemuxerStream::Status status,
+  void OnBufferReady(Status status,
                      mojom::DecoderBufferPtr buffer,
                      mojom::AudioDecoderConfigPtr audio_config,
                      mojom::VideoDecoderConfigPtr video_config);
 
   void UpdateConfig(mojom::AudioDecoderConfigPtr audio_config,
                     mojom::VideoDecoderConfigPtr video_config);
 
   // See constructor for descriptions.
   mojom::DemuxerStreamPtr demuxer_stream_;
   base::Closure stream_ready_cb_;
 
   // The last ReadCB received through a call to Read().
   // Used to store the results of OnBufferReady() in the event it is called
-  // with DemuxerStream::Status::kConfigChanged and we don't have an up to
-  // date AudioDecoderConfig yet. In that case we can't forward the results
+  // with Status::kConfigChanged and we don't have an up to date
+  // AudioDecoderConfig yet. In that case we can't forward the results
   // on to the caller of Read() until OnAudioDecoderConfigChanged is observed.
-  DemuxerStream::ReadCB read_cb_;
+  ReadCB read_cb_;
 
   // The current config.
   AudioDecoderConfig audio_config_;
   VideoDecoderConfig video_config_;
 
-  DemuxerStream::Type type_;
+  Type type_;
 
   std::unique_ptr<MojoDecoderBufferReader> mojo_decoder_buffer_reader_;
 
   base::WeakPtrFactory<MojoDemuxerStreamAdapter> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(MojoDemuxerStreamAdapter);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_DEMUXER_STREAM_ADAPTER_H_