media: Use native DecodeStatus in media mojo interfaces

media/mojo/services/mojo_audio_decoder_service.cc

 // 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.
 
 #include "media/mojo/services/mojo_audio_decoder_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "media/base/cdm_context.h"
@@ skipping 65 matching lines @@
       new MojoDecoderBufferReader(std::move(receive_pipe)));
 }
 
 void MojoAudioDecoderService::Decode(mojom::DecoderBufferPtr buffer,
                                      const DecodeCallback& callback) {
   DVLOG(3) << __FUNCTION__;
 
   scoped_refptr<DecoderBuffer> media_buffer =
       mojo_decoder_buffer_reader_->ReadDecoderBuffer(buffer);
   if (!media_buffer) {
-    callback.Run(mojom::DecodeStatus::DECODE_ERROR);
+    callback.Run(DecodeStatus::DECODE_ERROR);
     return;
   }
 
   decoder_->Decode(media_buffer,
                    base::Bind(&MojoAudioDecoderService::OnDecodeStatus,
                               weak_this_, callback));
 }
 
 void MojoAudioDecoderService::Reset(const ResetCallback& callback) {
   DVLOG(1) << __FUNCTION__;
   decoder_->Reset(
       base::Bind(&MojoAudioDecoderService::OnResetDone, weak_this_, callback));
 }
 
 void MojoAudioDecoderService::OnInitialized(const InitializeCallback& callback,
                                             scoped_refptr<MediaKeys> cdm,
                                             bool success) {
   DVLOG(1) << __FUNCTION__ << " success:" << success;
 
   if (success) {
     cdm_ = cdm;
     callback.Run(success, decoder_->NeedsBitstreamConversion());
   } else {
     // Do not call decoder_->NeedsBitstreamConversion() if init failed.
     callback.Run(false, false);
   }
 }
 
+// These two methods are needed so that we can bind them with a weak pointer to
+// avoid running the |callback| after connection error happens and |this| is
+// deleted. It's not safe to run the |callback| after a connection error.
+
 void MojoAudioDecoderService::OnDecodeStatus(const DecodeCallback& callback,
                                              media::DecodeStatus status) {
   DVLOG(3) << __FUNCTION__ << " status:" << status;
-  callback.Run(static_cast<mojom::DecodeStatus>(status));
+  callback.Run(status);
 }
 
 void MojoAudioDecoderService::OnResetDone(const ResetCallback& callback) {
   DVLOG(1) << __FUNCTION__;
   callback.Run();
 }
 
 void MojoAudioDecoderService::OnAudioBufferReady(
     const scoped_refptr<AudioBuffer>& audio_buffer) {
   DVLOG(1) << __FUNCTION__;
 
   // TODO(timav): Use DataPipe.
   client_->OnBufferDecoded(mojom::AudioBuffer::From(audio_buffer));
 }
 
 }  // namespace media