Revert of media: Simplify {Audio|Video}Decoder initialization callback.

media/filters/ffmpeg_video_decoder_unittest.cc

Index: media/filters/ffmpeg_video_decoder_unittest.cc
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index 160d18f24a5bd25125c4e9371417b693448baa1f..e902bd04f1d77a0ef8b88806051486f7f20a751c 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -68,16 +68,16 @@
     InitializeWithConfig(TestVideoConfig::Normal());
   }
 
-  void InitializeWithConfigWithResult(const VideoDecoderConfig& config,
-                                      bool success) {
-    decoder_->Initialize(config, false, NewExpectedBoolCB(success),
+  void InitializeWithConfigAndStatus(const VideoDecoderConfig& config,
+                                     PipelineStatus status) {
+    decoder_->Initialize(config, false, NewExpectedStatusCB(status),
                          base::Bind(&FFmpegVideoDecoderTest::FrameReady,
                                     base::Unretained(this)));
     message_loop_.RunUntilIdle();
   }
 
   void InitializeWithConfig(const VideoDecoderConfig& config) {
-    InitializeWithConfigWithResult(config, true);
+    InitializeWithConfigAndStatus(config, PIPELINE_OK);
   }
 
   void Reinitialize() {
@@ -217,7 +217,8 @@
 
 TEST_F(FFmpegVideoDecoderTest, Initialize_UnsupportedDecoder) {
   // Test avcodec_find_decoder() returning NULL.
-  InitializeWithConfigWithResult(TestVideoConfig::Invalid(), false);
+  InitializeWithConfigAndStatus(TestVideoConfig::Invalid(),
+                                DECODER_ERROR_NOT_SUPPORTED);
 }
 
 TEST_F(FFmpegVideoDecoderTest, Initialize_UnsupportedPixelFormat) {
@@ -226,7 +227,7 @@
                             VideoFrame::UNKNOWN,
                             kCodedSize, kVisibleRect, kNaturalSize,
                             NULL, 0, false);
-  InitializeWithConfigWithResult(config, false);
+  InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
 }
 
 TEST_F(FFmpegVideoDecoderTest, Initialize_OpenDecoderFails) {
@@ -235,7 +236,7 @@
                             kVideoFormat,
                             kCodedSize, kVisibleRect, kNaturalSize,
                             NULL, 0, false);
-  InitializeWithConfigWithResult(config, false);
+  InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
 }
 
 TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorZero) {
@@ -249,7 +250,7 @@
                             NULL,
                             0,
                             false);
-  InitializeWithConfigWithResult(config, false);
+  InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
 }
 
 TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorZero) {
@@ -263,7 +264,7 @@
                             NULL,
                             0,
                             false);
-  InitializeWithConfigWithResult(config, false);
+  InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
 }
 
 TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorNegative) {
@@ -277,7 +278,7 @@
                             NULL,
                             0,
                             false);
-  InitializeWithConfigWithResult(config, false);
+  InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
 }
 
 TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorNegative) {
@@ -291,7 +292,7 @@
                             NULL,
                             0,
                             false);
-  InitializeWithConfigWithResult(config, false);
+  InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
 }
 
 TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioNumeratorTooLarge) {
@@ -307,7 +308,7 @@
                             NULL,
                             0,
                             false);
-  InitializeWithConfigWithResult(config, false);
+  InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
 }
 
 TEST_F(FFmpegVideoDecoderTest, Initialize_AspectRatioDenominatorTooLarge) {
@@ -322,7 +323,7 @@
                             NULL,
                             0,
                             false);
-  InitializeWithConfigWithResult(config, false);
+  InitializeWithConfigAndStatus(config, DECODER_ERROR_NOT_SUPPORTED);
 }
 
 TEST_F(FFmpegVideoDecoderTest, Reinitialize_Normal) {
@@ -332,7 +333,8 @@
 
 TEST_F(FFmpegVideoDecoderTest, Reinitialize_Failure) {
   Initialize();
-  InitializeWithConfigWithResult(TestVideoConfig::Invalid(), false);
+  InitializeWithConfigAndStatus(TestVideoConfig::Invalid(),
+                                DECODER_ERROR_NOT_SUPPORTED);
 }
 
 TEST_F(FFmpegVideoDecoderTest, Reinitialize_AfterDecodeFrame) {