media: Use native Decryptor enum types in media mojo interfaces

media/mojo/services/mojo_decryptor_service.h

 // Copyright 2015 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_DECRYPTOR_SERVICE_H_
 #define MEDIA_MOJO_SERVICES_MOJO_DECRYPTOR_SERVICE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 11 matching lines @@
 
 class DecoderBuffer;
 class MediaKeys;
 class MojoDecoderBufferReader;
 class MojoDecoderBufferWriter;
 
 // A mojom::Decryptor implementation. This object is owned by the creator,
 // and uses a weak binding across the mojo interface.
 class MojoDecryptorService : public mojom::Decryptor {
  public:
+  using StreamType = media::Decryptor::StreamType;
+  using Status = media::Decryptor::Status;
+
   // Constructs a MojoDecryptorService and binds it to the |request|. Keeps a
   // copy of |cdm| to prevent it from being deleted as long as it is needed.
   // |error_handler| will be called if a connection error occurs.
   MojoDecryptorService(const scoped_refptr<MediaKeys>& cdm,
                        mojo::InterfaceRequest<mojom::Decryptor> request,
                        const base::Closure& error_handler);
 
   ~MojoDecryptorService() final;
 
   // mojom::Decryptor implementation.
   void Initialize(mojo::ScopedDataPipeConsumerHandle receive_pipe,
                   mojo::ScopedDataPipeProducerHandle transmit_pipe) final;
-  void Decrypt(mojom::DemuxerStream::Type stream_type,
+  void Decrypt(StreamType stream_type,
                mojom::DecoderBufferPtr encrypted,
                const DecryptCallback& callback) final;
-  void CancelDecrypt(mojom::DemuxerStream::Type stream_type) final;
+  void CancelDecrypt(StreamType stream_type) final;
   void InitializeAudioDecoder(
       mojom::AudioDecoderConfigPtr config,
       const InitializeAudioDecoderCallback& callback) final;
   void InitializeVideoDecoder(
       mojom::VideoDecoderConfigPtr config,
       const InitializeVideoDecoderCallback& callback) final;
   void DecryptAndDecodeAudio(
       mojom::DecoderBufferPtr encrypted,
       const DecryptAndDecodeAudioCallback& callback) final;
   void DecryptAndDecodeVideo(
       mojom::DecoderBufferPtr encrypted,
       const DecryptAndDecodeVideoCallback& callback) final;
-  void ResetDecoder(mojom::DemuxerStream::Type stream_type) final;
-  void DeinitializeDecoder(mojom::DemuxerStream::Type stream_type) final;
+  void ResetDecoder(StreamType stream_type) final;
+  void DeinitializeDecoder(StreamType stream_type) final;
   void ReleaseSharedBuffer(mojo::ScopedSharedBufferHandle buffer,
                            uint64_t buffer_size) final;
 
  private:
   // Callback executed once Decrypt() is done.
   void OnDecryptDone(const DecryptCallback& callback,
-                     media::Decryptor::Status status,
+                     Status status,
                      const scoped_refptr<DecoderBuffer>& buffer);
 
   // Callbacks executed once decoder initialized.
   void OnAudioDecoderInitialized(const InitializeAudioDecoderCallback& callback,
                                  bool success);
   void OnVideoDecoderInitialized(const InitializeVideoDecoderCallback& callback,
                                  bool success);
 
   // Callbacks executed when DecryptAndDecode are done.
   void OnAudioDecoded(const DecryptAndDecodeAudioCallback& callback,
-                      media::Decryptor::Status status,
+                      Status status,
                       const media::Decryptor::AudioFrames& frames);
   void OnVideoDecoded(const DecryptAndDecodeVideoCallback& callback,
-                      media::Decryptor::Status status,
+                      Status status,
                       const scoped_refptr<VideoFrame>& frame);
 
   // A weak binding is used to connect to the MojoDecryptor.
   mojo::Binding<mojom::Decryptor> binding_;
 
   // Helper class to send decrypted DecoderBuffer to the client.
   std::unique_ptr<MojoDecoderBufferWriter> mojo_decoder_buffer_writer_;
 
   // Helper class to receive encrypted DecoderBuffer from the client.
   std::unique_ptr<MojoDecoderBufferReader> mojo_decoder_buffer_reader_;
@@ skipping 10 matching lines @@
 
   base::WeakPtr<MojoDecryptorService> weak_this_;
   base::WeakPtrFactory<MojoDecryptorService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoDecryptorService);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_DECRYPTOR_SERVICE_H_