| Index: media/filters/audio_decoder_unittest.cc
|
| diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
|
| index cfaf4b8affa67e9c4cda43194d7cc888531ef3e8..12c86e35280830048ede16ea49643893e610bf70 100644
|
| --- a/media/filters/audio_decoder_unittest.cc
|
| +++ b/media/filters/audio_decoder_unittest.cc
|
| @@ -380,8 +380,6 @@ class AudioDecoderTest : public testing::TestWithParam<DecoderTestData> {
|
| DISALLOW_COPY_AND_ASSIGN(AudioDecoderTest);
|
| };
|
|
|
| -class FFmpegAudioDecoderBehavioralTest : public AudioDecoderTest {};
|
| -
|
| TEST_P(AudioDecoderTest, Initialize) {
|
| SKIP_TEST_IF_NO_MEDIA_CODEC();
|
| ASSERT_NO_FATAL_FAILURE(Initialize());
|
| @@ -483,7 +481,7 @@ const DecoderTestData kMediaCodecTests[] = {
|
| #endif
|
| };
|
|
|
| -INSTANTIATE_TEST_CASE_P(MediaCodecAudioDecoderTest,
|
| +INSTANTIATE_TEST_CASE_P(MediaCodec,
|
| AudioDecoderTest,
|
| testing::ValuesIn(kMediaCodecTests));
|
| #endif // defined(OS_ANDROID)
|
| @@ -571,16 +569,8 @@ const DecoderTestData kFFmpegTests[] = {
|
| CHANNEL_LAYOUT_STEREO},
|
| };
|
|
|
| -// Dummy data for behavioral tests.
|
| -const DecoderTestData kFFmpegBehavioralTest[] = {
|
| - {FFMPEG, kUnknownAudioCodec, "", NULL, 0, 0, CHANNEL_LAYOUT_NONE},
|
| -};
|
| -
|
| -INSTANTIATE_TEST_CASE_P(FFmpegAudioDecoderTest,
|
| +INSTANTIATE_TEST_CASE_P(FFmpeg,
|
| AudioDecoderTest,
|
| testing::ValuesIn(kFFmpegTests));
|
| -INSTANTIATE_TEST_CASE_P(FFmpegAudioDecoderBehavioralTest,
|
| - FFmpegAudioDecoderBehavioralTest,
|
| - testing::ValuesIn(kFFmpegBehavioralTest));
|
|
|
| } // namespace media
|
|
|