Rename browser side MediaCodec-based decoders

media/base/android/media_codec_player.cc

Index: media/base/android/media_codec_player.cc
diff --git a/media/base/android/media_codec_player.cc b/media/base/android/media_codec_player.cc
index 3bddcba9fae2bc0a09c476d53bd7053267206b70..7eb96442319b7aa1a64c6492f1a25939ced50995 100644
--- a/media/base/android/media_codec_player.cc
+++ b/media/base/android/media_codec_player.cc
@@ -13,11 +13,11 @@
 #include "base/logging.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
-#include "media/base/android/media_codec_audio_decoder.h"
-#include "media/base/android/media_codec_video_decoder.h"
+#include "media/base/android/audio_media_codec_decoder.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/android/media_player_manager.h"
 #include "media/base/android/media_task_runner.h"
+#include "media/base/android/video_media_codec_decoder.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/timestamp_constants.h"
 
@@ -1351,7 +1351,7 @@ void MediaCodecPlayer::CreateDecoders() {
 
   media_stat_.reset(new MediaStatistics());
 
-  audio_decoder_.reset(new MediaCodecAudioDecoder(
+  audio_decoder_.reset(new AudioMediaCodecDecoder(
       GetMediaTaskRunner(), &media_stat_->audio_frame_stats(),
       base::Bind(&MediaCodecPlayer::RequestDemuxerData, media_weak_this_,
                  DemuxerStream::AUDIO),
@@ -1363,11 +1363,10 @@ void MediaCodecPlayer::CreateDecoders() {
                  DemuxerStream::AUDIO),
       base::Bind(&MediaCodecPlayer::OnMissingKeyReported, media_weak_this_,
                  DemuxerStream::AUDIO),
-      internal_error_cb_,
-      base::Bind(&MediaCodecPlayer::OnTimeIntervalUpdate, media_weak_this_,
-                 DemuxerStream::AUDIO)));
+      internal_error_cb_, base::Bind(&MediaCodecPlayer::OnTimeIntervalUpdate,
+                                     media_weak_this_, DemuxerStream::AUDIO)));
 
-  video_decoder_.reset(new MediaCodecVideoDecoder(
+  video_decoder_.reset(new VideoMediaCodecDecoder(
       GetMediaTaskRunner(), &media_stat_->video_frame_stats(),
       base::Bind(&MediaCodecPlayer::RequestDemuxerData, media_weak_this_,
                  DemuxerStream::VIDEO),
@@ -1379,9 +1378,8 @@ void MediaCodecPlayer::CreateDecoders() {
                  DemuxerStream::VIDEO),
       base::Bind(&MediaCodecPlayer::OnMissingKeyReported, media_weak_this_,
                  DemuxerStream::VIDEO),
-      internal_error_cb_,
-      base::Bind(&MediaCodecPlayer::OnTimeIntervalUpdate, media_weak_this_,
-                 DemuxerStream::VIDEO),
+      internal_error_cb_, base::Bind(&MediaCodecPlayer::OnTimeIntervalUpdate,
+                                     media_weak_this_, DemuxerStream::VIDEO),
       base::Bind(&MediaCodecPlayer::OnVideoResolutionChanged,
                  media_weak_this_)));
 }