Rename kDecoderFailedConfigure to kDecoderFailedInitialization

this new name is more descriptive of the error.

Bug: 1043289
Change-Id: If4f095410e162f989c1e5f8c533ae8e49722adbf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2121423Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#754669}

content/renderer/pepper/video_decoder_shim.cc

@@ -180,7 +180,7 @@ void VideoDecoderShim::DecoderImpl::Initialize(
                           weak_ptr_factory_.GetWeakPtr()),
       base::NullCallback());
 #else
-  OnInitDone(media::StatusCode::kDecoderFailedConfigure);
+  OnInitDone(media::StatusCode::kDecoderFailedInitialization));
 #endif  // BUILDFLAG(ENABLE_LIBVPX) || BUILDFLAG(ENABLE_FFMPEG_VIDEO_DECODERS)
 }
 

media/base/status_codes.h

@@ -36,7 +36,7 @@ enum class StatusCode : StatusCodeType {
   kEncryptedContentUnsupported = 0x00000106,
   kClearContentUnsupported = 0x00000107,
   kDecoderMissingCdmForEncryptedContent = 0x00000108,
-  kDecoderFailedConfigure = 0x00000109,
+  kDecoderFailedInitialization = 0x00000109,
   kDecoderCantChangeCodec = 0x0000010A,
   kDecoderFailedCreation = 0x0000010B,
   kInitializationUnspecifiedFailure = 0x0000010C,

media/base/test_helpers.h

@@ -206,8 +206,8 @@ MATCHER_P(SameStatusCode, status, "") {
 }
 
 // Compares two an |arg| Status to a StatusCode provided
-MATCHER_P(HasStatusCode, statusCode, "") {
-  return arg.code() == statusCode;
+MATCHER_P(HasStatusCode, status_code, "") {
+  return arg.code() == status_code;
 }
 
 MATCHER(IsOkStatus, "") {

media/filters/android/media_codec_audio_decoder.cc

@@ -89,7 +89,7 @@ void MediaCodecAudioDecoder::Initialize(const AudioDecoderConfig& config,
   if (state_ == STATE_ERROR) {
     DVLOG(1) << "Decoder is in error state.";
     BindToCurrentLoop(std::move(init_cb))
-        .Run(StatusCode::kDecoderFailedConfigure);
+        .Run(StatusCode::kDecoderFailedInitialization);
     return;
   }
 
@@ -135,7 +135,7 @@ void MediaCodecAudioDecoder::Initialize(const AudioDecoderConfig& config,
 
   if (!CreateMediaCodecLoop()) {
     BindToCurrentLoop(std::move(init_cb))
-        .Run(StatusCode::kDecoderFailedConfigure);
+        .Run(StatusCode::kDecoderFailedInitialization);
     return;
   }
 
@@ -288,7 +288,7 @@ void MediaCodecAudioDecoder::OnMediaCryptoReady(
   // After receiving |media_crypto_| we can configure MediaCodec.
   if (!CreateMediaCodecLoop()) {
     SetState(STATE_UNINITIALIZED);
-    std::move(init_cb).Run(StatusCode::kDecoderFailedConfigure);
+    std::move(init_cb).Run(StatusCode::kDecoderFailedInitialization);
     return;
   }
 

media/filters/dav1d_video_decoder.cc

@@ -222,7 +222,7 @@ void Dav1dVideoDecoder::Initialize(const VideoDecoderConfig& config,
 
   // TODO(tmathmeyer) write the dav1d error into the data for the media error.
   if (dav1d_open(&dav1d_decoder_, &s) < 0) {
-    std::move(bound_init_cb).Run(StatusCode::kDecoderFailedConfigure);
+    std::move(bound_init_cb).Run(StatusCode::kDecoderFailedInitialization);
     return;
   }
 

media/filters/decrypting_audio_decoder.cc

@@ -88,7 +88,7 @@ void DecryptingAudioDecoder::Initialize(const AudioDecoderConfig& config,
   if (state_ == kUninitialized) {
     if (!cdm_context->GetDecryptor()) {
       DVLOG(1) << __func__ << ": no decryptor";
-      std::move(init_cb_).Run(StatusCode::kDecoderFailedConfigure);
+      std::move(init_cb_).Run(StatusCode::kDecoderFailedInitialization);
       return;
     }
 

media/filters/decrypting_video_decoder.cc

@@ -73,7 +73,7 @@ void DecryptingVideoDecoder::Initialize(const VideoDecoderConfig& config,
   if (state_ == kUninitialized) {
     if (!cdm_context->GetDecryptor()) {
       DVLOG(1) << __func__ << ": no decryptor";
-      std::move(init_cb_).Run(StatusCode::kDecoderFailedConfigure);
+      std::move(init_cb_).Run(StatusCode::kDecoderFailedInitialization);
       return;
     }
 

media/filters/ffmpeg_audio_decoder.cc

@@ -95,7 +95,7 @@ void FFmpegAudioDecoder::Initialize(const AudioDecoderConfig& config,
 
   if (!ConfigureDecoder(config)) {
     av_sample_format_ = 0;
-    std::move(bound_init_cb).Run(StatusCode::kDecoderFailedConfigure);
+    std::move(bound_init_cb).Run(StatusCode::kDecoderFailedInitialization);
     return;
   }
 

media/filters/ffmpeg_video_decoder.cc

@@ -219,7 +219,7 @@ void FFmpegVideoDecoder::Initialize(const VideoDecoderConfig& config,
   }
 
   if (!ConfigureDecoder(config, low_delay)) {
-    std::move(bound_init_cb).Run(StatusCode::kDecoderFailedConfigure);
+    std::move(bound_init_cb).Run(StatusCode::kDecoderFailedInitialization);
     return;
   }
 

media/filters/gav1_video_decoder.cc

@@ -264,7 +264,7 @@ void Gav1VideoDecoder::Initialize(const VideoDecoderConfig& config,
   if (status != kLibgav1StatusOk) {
     MEDIA_LOG(ERROR, media_log_) << "libgav1::Decoder::Init() failed, "
                                  << "status=" << status;
-    std::move(bound_init_cb).Run(StatusCode::kDecoderFailedConfigure);
+    std::move(bound_init_cb).Run(StatusCode::kDecoderFailedInitialization);
     return;
   }
 

media/filters/vpx_video_decoder.cc

@@ -132,7 +132,7 @@ void VpxVideoDecoder::Initialize(const VideoDecoderConfig& config,
   }
 
   if (!ConfigureDecoder(config)) {
-    std::move(bound_init_cb).Run(StatusCode::kDecoderFailedConfigure);
+    std::move(bound_init_cb).Run(StatusCode::kDecoderFailedInitialization);
     return;
   }