media: Use native DecodeStatus in media mojo interfaces

media/mojo/services/mojo_video_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_video_decoder_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 46 matching lines @@
     return;
   }
 
   decoder_->Initialize(
       config.To<VideoDecoderConfig>(), low_delay, nullptr,
       base::Bind(&MojoVideoDecoderService::OnDecoderInitialized, weak_this_,
                  callback),
       base::Bind(&MojoVideoDecoderService::OnDecoderOutput, weak_this_));
 }
 
-void MojoVideoDecoderService::OnDecoderInitialized(
-    const InitializeCallback& callback,
-    bool success) {
-  DVLOG(1) << __FUNCTION__;
-  callback.Run(success);
-}
-
-void MojoVideoDecoderService::OnDecoderOutput(
-    const scoped_refptr<VideoFrame>& frame) {
-  DVLOG(1) << __FUNCTION__;
-  DCHECK(client_);
-  client_->OnVideoFrameDecoded(mojom::VideoFrame::From(frame));
-}
-
 void MojoVideoDecoderService::Decode(mojom::DecoderBufferPtr buffer,
                                      const DecodeCallback& callback) {
   DVLOG(1) << __FUNCTION__;
 
   if (!decoder_) {
-    callback.Run(mojom::DecodeStatus::DECODE_ERROR);
+    callback.Run(DecodeStatus::DECODE_ERROR);
     return;
   }
 
   // TODO(sandersd): After a decode error, we should enter an error state and
   // reject all future method calls.
   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(&MojoVideoDecoderService::OnDecoderDecoded,
                               weak_this_, callback));
 }
 
-void MojoVideoDecoderService::OnDecoderDecoded(const DecodeCallback& callback,
-                                               DecodeStatus status) {
-  DVLOG(1) << __FUNCTION__;
-  callback.Run(static_cast<mojom::DecodeStatus>(status));
-}
-
 void MojoVideoDecoderService::Reset(const ResetCallback& callback) {
   DVLOG(1) << __FUNCTION__;
 
   if (!decoder_) {
     callback.Run();
     return;
   }
 
   decoder_->Reset(base::Bind(&MojoVideoDecoderService::OnDecoderReset,
                              weak_this_, callback));
 }
 
+void MojoVideoDecoderService::OnDecoderInitialized(
+    const InitializeCallback& callback,
+    bool success) {
+  DVLOG(1) << __FUNCTION__;
+  callback.Run(success);
+}
+
+void MojoVideoDecoderService::OnDecoderDecoded(const DecodeCallback& callback,
+                                               DecodeStatus status) {
+  DVLOG(1) << __FUNCTION__;
+  callback.Run(status);
+}
+
 void MojoVideoDecoderService::OnDecoderReset(const ResetCallback& callback) {
   DVLOG(1) << __FUNCTION__;
   callback.Run();
 }
 
+void MojoVideoDecoderService::OnDecoderOutput(
+    const scoped_refptr<VideoFrame>& frame) {
+  DVLOG(1) << __FUNCTION__;
+  DCHECK(client_);
+  client_->OnVideoFrameDecoded(mojom::VideoFrame::From(frame));
+}
+
 }  // namespace media