media: Simplify audio test names

media/filters/audio_decoder_unittest.cc

 // Copyright 2014 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 <stddef.h>
 #include <stdint.h>
 
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 465 matching lines @@
     {MEDIA_CODEC, kCodecOpus, "bear-opus.ogg", kBearOpusExpectations, 24, 48000,
      CHANNEL_LAYOUT_STEREO},
 #if defined(USE_PROPRIETARY_CODECS)
     {MEDIA_CODEC, kCodecAAC, "sfx.adts", kSfxAdtsMcExpectations, 0, 44100,
      CHANNEL_LAYOUT_MONO},
     {MEDIA_CODEC, kCodecAAC, "bear-audio-implicit-he-aac-v2.aac",
      kHeAacMcExpectations, 0, 24000, CHANNEL_LAYOUT_MONO},
 #endif
 };
 
-INSTANTIATE_TEST_CASE_P(MediaCodecAudioDecoderTest,
+INSTANTIATE_TEST_CASE_P(MediaCodec,
                         AudioDecoderTest,
                         testing::ValuesIn(kMediaCodecTests));
 #endif  // defined(OS_ANDROID)
 
 #if defined(USE_PROPRIETARY_CODECS)
 const DecodedBufferExpectations kSfxMp3Expectations[] = {
     {0, 1065, "2.81,3.99,4.53,4.10,3.08,2.46,"},
     {1065, 26122, "-3.81,-4.14,-3.90,-3.36,-3.03,-3.23,"},
     {27188, 26122, "4.24,3.95,4.22,4.78,5.13,4.93,"},
 };
@@ skipping 72 matching lines @@
      CHANNEL_LAYOUT_MONO},
     {FFMPEG, kCodecOpus, "bear-opus.ogg", kBearOpusExpectations, 24, 48000,
      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,
+
+INSTANTIATE_TEST_CASE_P(/* no prefix */,
                         FFmpegAudioDecoderBehavioralTest,

[xhwang, 2017/01/13 17:32:51]

It seems this test is empty. Do we still need it?

[DaleCurtis, 2017/01/14 00:26:20]

Don't think so? See l.575.

[xhwang, 2017/01/14 00:28:05]

k, I'll just remove it.

                         testing::ValuesIn(kFFmpegBehavioralTest));
 
 }  // namespace media