media: Use new wrapper types for media mojo interfaces

media/mojo/services/mojo_decryptor_service.cc

 // 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.
 
 #include "media/mojo/services/mojo_decryptor_service.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/numerics/safe_conversions.h"
@@ skipping 80 matching lines @@
 }
 
 void MojoDecryptorService::DecryptAndDecodeAudio(
     mojom::DecoderBufferPtr encrypted,
     const DecryptAndDecodeAudioCallback& callback) {
   DVLOG(3) << __FUNCTION__;
 
   scoped_refptr<DecoderBuffer> media_buffer =
       mojo_decoder_buffer_reader_->ReadDecoderBuffer(encrypted);
   if (!media_buffer) {
-    callback.Run(Status::DECRYPTION_ERROR, nullptr);
+    callback.Run(Status::DECRYPTION_ERROR,
+                 std::vector<mojom::AudioBufferPtr>());
     return;
   }
 
   decryptor_->DecryptAndDecodeAudio(
       std::move(media_buffer),
       base::Bind(&MojoDecryptorService::OnAudioDecoded, weak_this_, callback));
 }
 
 void MojoDecryptorService::DecryptAndDecodeVideo(
     mojom::DecoderBufferPtr encrypted,
@@ skipping 71 matching lines @@
 }
 
 void MojoDecryptorService::OnAudioDecoded(
     const DecryptAndDecodeAudioCallback& callback,
     media::Decryptor::Status status,
     const media::Decryptor::AudioFrames& frames) {
   DVLOG_IF(1, status != media::Decryptor::kSuccess) << __FUNCTION__ << "("
                                                     << status << ")";
   DVLOG_IF(3, status == media::Decryptor::kSuccess) << __FUNCTION__;
 
-  mojo::Array<mojom::AudioBufferPtr> audio_buffers;
+  std::vector<mojom::AudioBufferPtr> audio_buffers;
   for (const auto& frame : frames)
     audio_buffers.push_back(mojom::AudioBuffer::From(frame));
 
   callback.Run(static_cast<Decryptor::Status>(status),
                std::move(audio_buffers));
 }
 
 void MojoDecryptorService::OnVideoDecoded(
     const DecryptAndDecodeVideoCallback& callback,
     media::Decryptor::Status status,
@@ skipping 15 matching lines @@
         static_cast<MojoSharedBufferVideoFrame*>(frame.get());
     in_use_video_frames_.insert(
         std::make_pair(mojo_frame->Handle().value(), frame));
   }
 
   callback.Run(static_cast<Decryptor::Status>(status),
                mojom::VideoFrame::From(frame));
 }
 
 }  // namespace media