Revert "Remove underscores from test names to follow GTest convention…

…s //media." #9

This reverts commit dd89c95.

Reason: https://groups.google.com/a/chromium.org/g/chromium-dev/c/KxzyXKv7adQ

Based on the discussion here, I have decided to terminate this work.

Bug: 377144451
Change-Id: I99440c063c09db77c26cae7f4e2316f1fe1849c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6065880
Reviewed-by: Colin Blundell <[email protected]>
Reviewed-by: Mark Foltz <[email protected]>
Commit-Queue: Ho Cheung <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1391354}

media/base/amplitude_peak_detector_unittest.cc

@@ -108,29 +108,29 @@ TEST_F(AmplitudePeakDetectorTest, Constructor) {
           FROM_HERE, "Callback should not be run by default"));
 }
 
-TEST_F(AmplitudePeakDetectorTest, NoPeaksSilent) {
+TEST_F(AmplitudePeakDetectorTest, NoPeaks_Silent) {
   CreateDetector(base::MakeExpectedNotRunClosure(
       FROM_HERE, "No peaks should be detected for silent data"));
 
   auto bus = GetSilentAudioBus();
   peak_detector_->FindPeak(bus.get());
 }
 
-TEST_F(AmplitudePeakDetectorTest, NoPeaksQuietValue) {
+TEST_F(AmplitudePeakDetectorTest, NoPeaks_QuietValue) {
   RunSimpleDetectionTest(kQuietSample, /*expect_peak=*/false,
                          "No peaks should be detected for positive quiet data");
   RunSimpleDetectionTest(-kQuietSample, /*expect_peak=*/false,
                          "No peaks should be detected for negative quiet data");
 }
 
-TEST_F(AmplitudePeakDetectorTest, PeaksLoudValue) {
+TEST_F(AmplitudePeakDetectorTest, Peaks_LoudValue) {
   RunSimpleDetectionTest(kLoudSample, /*expect_peak=*/true,
                          "Peaks should be detected for positive loud data");
   RunSimpleDetectionTest(-kLoudSample, /*expect_peak=*/true,
                          "Peaks should be detected for negative loud data");
 }
 
-TEST_F(AmplitudePeakDetectorTest, SequenceSilenceAndQuiet) {
+TEST_F(AmplitudePeakDetectorTest, Sequence_SilenceAndQuiet) {
   auto silent_bus = GetSilentAudioBus();
   auto quiet_bus = GetAudioBusWithSetValue(kQuietSample, {0, 0});
 
@@ -146,7 +146,7 @@ TEST_F(AmplitudePeakDetectorTest, SequenceSilenceAndQuiet) {
   EXPECT_EQ(peak_count, 0);
 }
 
-TEST_F(AmplitudePeakDetectorTest, SequenceShortPeak) {
+TEST_F(AmplitudePeakDetectorTest, Sequence_ShortPeak) {
   auto silent_bus = GetSilentAudioBus();
   auto loud_bus = GetAudioBusWithLoudValue();
 
@@ -169,7 +169,7 @@ TEST_F(AmplitudePeakDetectorTest, SequenceShortPeak) {
   EXPECT_EQ(peak_count, 2);
 }
 
-TEST_F(AmplitudePeakDetectorTest, SequenceLongPeak) {
+TEST_F(AmplitudePeakDetectorTest, Sequence_LongPeak) {
   auto silent_bus = GetSilentAudioBus();
   auto loud_bus = GetAudioBusWithLoudValue();
 
@@ -255,7 +255,7 @@ class FixedSampleAmplitudePeakDetector : public AmplitudePeakDetectorTest {
   }
 };
 
-TEST_P(FixedSampleAmplitudePeakDetector, NoPeaksSilent) {
+TEST_P(FixedSampleAmplitudePeakDetector, NoPeaks_Silent) {
   switch (bytes_per_samples()) {
     case 1:
       VerifyNoPeaksFoundInSilence<uint8_t>();
@@ -269,7 +269,7 @@ TEST_P(FixedSampleAmplitudePeakDetector, NoPeaksSilent) {
   }
 }
 
-TEST_P(FixedSampleAmplitudePeakDetector, NoPeaksQuiet) {
+TEST_P(FixedSampleAmplitudePeakDetector, NoPeaks_Quiet) {
   constexpr char message[] = "No peaks detected from quiet values";
 
   switch (bytes_per_samples()) {
@@ -288,7 +288,7 @@ TEST_P(FixedSampleAmplitudePeakDetector, NoPeaksQuiet) {
   }
 }
 
-TEST_P(FixedSampleAmplitudePeakDetector, PeaksLoud) {
+TEST_P(FixedSampleAmplitudePeakDetector, Peaks_Loud) {
   constexpr char message[] = "Peaks detected in loud values";
 
   switch (bytes_per_samples()) {
@@ -307,7 +307,7 @@ TEST_P(FixedSampleAmplitudePeakDetector, PeaksLoud) {
   }
 }
 
-TEST_F(FixedSampleAmplitudePeakDetector, SequenceSilenceAndQuiet) {
+TEST_F(FixedSampleAmplitudePeakDetector, Sequence_SilenceAndQuiet) {
   constexpr int kBytesPerSample = 4;
   std::vector<uint32_t> silent_data(
       kFrames, SignedInt32SampleTypeTraits::kZeroPointValue);
@@ -326,7 +326,7 @@ TEST_F(FixedSampleAmplitudePeakDetector, SequenceSilenceAndQuiet) {
   EXPECT_EQ(peak_count, 0);
 }
 
-TEST_F(FixedSampleAmplitudePeakDetector, SequenceShortPeak) {
+TEST_F(FixedSampleAmplitudePeakDetector, Sequence_ShortPeak) {
   constexpr int kBytesPerSample = 4;
   std::vector<uint32_t> silent_data(
       kFrames, SignedInt32SampleTypeTraits::kZeroPointValue);
@@ -352,7 +352,7 @@ TEST_F(FixedSampleAmplitudePeakDetector, SequenceShortPeak) {
   EXPECT_EQ(peak_count, 2);
 }
 
-TEST_P(FixedSampleAmplitudePeakDetector, SequenceLongPeak) {
+TEST_P(FixedSampleAmplitudePeakDetector, Sequence_LongPeak) {
   constexpr int kBytesPerSample = 4;
   std::vector<uint32_t> silent_data(
       kFrames, SignedInt32SampleTypeTraits::kZeroPointValue);

media/base/android/media_drm_bridge_unittest.cc

@@ -153,7 +153,7 @@ class MediaDrmBridgeTest : public ProvisionFetcher, public testing::Test {
   base::test::TaskEnvironment task_environment_;
 };
 
-TEST_F(MediaDrmBridgeTest, IsKeySystemSupportedWidevine) {
+TEST_F(MediaDrmBridgeTest, IsKeySystemSupported_Widevine) {
   // TODO(xhwang): Enable when b/13564917 is fixed.
   // EXPECT_TRUE_IF_AVAILABLE(
   //     IsKeySystemSupportedWithType(kWidevineKeySystem, kAudioMp4));
@@ -173,7 +173,7 @@ TEST_F(MediaDrmBridgeTest, IsKeySystemSupportedWidevine) {
   EXPECT_FALSE(IsKeySystemSupportedWithType(kWidevineKeySystem, "audio/mp3"));
 }
 
-TEST_F(MediaDrmBridgeTest, IsKeySystemSupportedExternalClearKey) {
+TEST_F(MediaDrmBridgeTest, IsKeySystemSupported_ExternalClearKey) {
   // Testing that 'kExternalClearKeyForTesting' is disabled by default.
   EXPECT_FALSE(
       base::FeatureList::IsEnabled(media::kExternalClearKeyForTesting));
@@ -186,7 +186,7 @@ TEST_F(MediaDrmBridgeTest, IsKeySystemSupportedExternalClearKey) {
 }
 
 // Invalid key system is NOT supported regardless whether MediaDrm is available.
-TEST_F(MediaDrmBridgeTest, IsKeySystemSupportedInvalidKeySystem) {
+TEST_F(MediaDrmBridgeTest, IsKeySystemSupported_InvalidKeySystem) {
   EXPECT_FALSE(MediaDrmBridge::IsKeySystemSupported(kInvalidKeySystem));
   EXPECT_FALSE(IsKeySystemSupportedWithType(kInvalidKeySystem, kAudioMp4));
   EXPECT_FALSE(IsKeySystemSupportedWithType(kInvalidKeySystem, kVideoMp4));
@@ -197,14 +197,14 @@ TEST_F(MediaDrmBridgeTest, IsKeySystemSupportedInvalidKeySystem) {
   EXPECT_FALSE(IsKeySystemSupportedWithType(kInvalidKeySystem, "audio/mp3"));
 }
 
-TEST_F(MediaDrmBridgeTest, CreateWithoutSessionSupportWidevine) {
+TEST_F(MediaDrmBridgeTest, CreateWithoutSessionSupport_Widevine) {
   CreateWithoutSessionSupport(kWidevineKeySystem, kTestOrigin, kDefault);
   EXPECT_VALUE_IF_KEY_SYSTEM_AVAILABLE_OR_ERROR(
       media_drm_bridge_, kWidevineKeySystem,
       CreateCdmTypedStatus::Codes::kUnsupportedKeySystem);
 }
 
-TEST_F(MediaDrmBridgeTest, CreateWithoutSessionSupportExternalClearKey) {
+TEST_F(MediaDrmBridgeTest, CreateWithoutSessionSupport_ExternalClearKey) {
   CreateWithoutSessionSupport(kExternalClearKeyKeySystem, kTestOrigin,
                               kDefault);
   EXPECT_EQ(media_drm_bridge_.code(),
@@ -220,14 +220,14 @@ TEST_F(MediaDrmBridgeTest, CreateWithoutSessionSupportExternalClearKey) {
 }
 
 // Invalid key system is NOT supported regardless whether MediaDrm is available.
-TEST_F(MediaDrmBridgeTest, CreateWithoutSessionSupportInvalidKeySystem) {
+TEST_F(MediaDrmBridgeTest, CreateWithoutSessionSupport_InvalidKeySystem) {
   CreateWithoutSessionSupport(kInvalidKeySystem, kTestOrigin, kDefault);
   EXPECT_FALSE(media_drm_bridge_.has_value());
   EXPECT_EQ(media_drm_bridge_.code(),
             CreateCdmTypedStatus::Codes::kUnsupportedKeySystem);
 }
 
-TEST_F(MediaDrmBridgeTest, CreateWithSecurityLevelWidevine) {
+TEST_F(MediaDrmBridgeTest, CreateWithSecurityLevel_Widevine) {
   // We test "L3" fully. But for "L1" we don't check the result as it depends on
   // whether the test device supports "L1".
   CreateWithoutSessionSupport(kWidevineKeySystem, kTestOrigin, kL3);
@@ -238,7 +238,7 @@ TEST_F(MediaDrmBridgeTest, CreateWithSecurityLevelWidevine) {
   CreateWithoutSessionSupport(kWidevineKeySystem, kTestOrigin, kL1);
 }
 
-TEST_F(MediaDrmBridgeTest, CreateWithSecurityLevelExternalClearKey) {
+TEST_F(MediaDrmBridgeTest, CreateWithSecurityLevel_ExternalClearKey) {
   scoped_feature_list_.InitWithFeatures({media::kExternalClearKeyForTesting},
                                         {});
 
@@ -250,7 +250,7 @@ TEST_F(MediaDrmBridgeTest, CreateWithSecurityLevelExternalClearKey) {
       CreateCdmTypedStatus::Codes::kUnsupportedKeySystem);
 }
 
-TEST_F(MediaDrmBridgeTest, ProvisionWidevine) {
+TEST_F(MediaDrmBridgeTest, Provision_Widevine) {
   // Only test this if Widevine is supported. Otherwise
   // CreateWithoutSessionSupport() will return null and it can't be tested.
   if (!MediaDrmBridge::IsKeySystemSupported(kWidevineKeySystem)) {
@@ -279,7 +279,7 @@ TEST_F(MediaDrmBridgeTest, ProvisionWidevine) {
   base::RunLoop().RunUntilIdle();
 }
 
-TEST_F(MediaDrmBridgeTest, ProvisionWidevineNoOrigin) {
+TEST_F(MediaDrmBridgeTest, Provision_Widevine_NoOrigin) {
   // Only test this if Widevine is supported. Otherwise
   // CreateWithoutSessionSupport() will return null and it can't be tested.
   if (!MediaDrmBridge::IsKeySystemSupported(kWidevineKeySystem)) {
@@ -303,7 +303,7 @@ TEST_F(MediaDrmBridgeTest, ProvisionWidevineNoOrigin) {
   base::RunLoop().RunUntilIdle();
 }
 
-TEST_F(MediaDrmBridgeTest, UnprovisionWidevine) {
+TEST_F(MediaDrmBridgeTest, Unprovision_Widevine) {
   // Only test this if Widevine is supported. Otherwise
   // CreateWithoutSessionSupport() will return null and it can't be tested.
   if (!MediaDrmBridge::IsKeySystemSupported(kWidevineKeySystem)) {
@@ -320,7 +320,7 @@ TEST_F(MediaDrmBridgeTest, UnprovisionWidevine) {
   Unprovision();
 }
 
-TEST_F(MediaDrmBridgeTest, GetStatusForPolicyFeatureFlagDisabled) {
+TEST_F(MediaDrmBridgeTest, GetStatusForPolicy_FeatureFlagDisabled) {
   // Only test this if Widevine is supported. Otherwise
   // CreateWithoutSessionSupport() will return null and it can't be
   // tested.
@@ -345,7 +345,7 @@ TEST_F(MediaDrmBridgeTest, GetStatusForPolicyFeatureFlagDisabled) {
   EXPECT_EQ(exception, CdmPromise::Exception::NOT_SUPPORTED_ERROR);
 }
 
-TEST_F(MediaDrmBridgeTest, GetStatusForPolicyExternalClearKey) {
+TEST_F(MediaDrmBridgeTest, GetStatusForPolicy_ExternalClearKey) {
   scoped_feature_list_.InitWithFeatures({media::kExternalClearKeyForTesting},
                                         {});
 
@@ -378,7 +378,7 @@ TEST_F(MediaDrmBridgeTest, GetStatusForPolicyExternalClearKey) {
   EXPECT_EQ(CdmKeyInformation::KeyStatus::OUTPUT_RESTRICTED, key_status);
 }
 
-TEST_F(MediaDrmBridgeTest, GetStatusForPolicyL3Widevine) {
+TEST_F(MediaDrmBridgeTest, GetStatusForPolicyL3_Widevine) {
   // Only test this if Widevine is supported. Otherwise
   // CreateWithoutSessionSupport() will return null and it can't be
   // tested.

media/base/android/media_player_bridge_unittest.cc

@@ -65,15 +65,15 @@ class MediaPlayerBridgeTest : public testing::Test {
   MediaPlayerBridge bridge_;
 };
 
-TEST_F(MediaPlayerBridgeTest, ClientOnMediaMetadataChanged) {
+TEST_F(MediaPlayerBridgeTest, Client_OnMediaMetadataChanged) {
   const base::TimeDelta kDuration = base::Seconds(20);
 
   EXPECT_CALL(client_, OnMediaDurationChanged(kDuration));
 
   SimulateDurationChange(kDuration);
 }
 
-TEST_F(MediaPlayerBridgeTest, ClientOnVideoSizeChanged) {
+TEST_F(MediaPlayerBridgeTest, Client_OnVideoSizeChanged) {
   const int kWidth = 1600;
   const int kHeight = 900;
 
@@ -82,13 +82,13 @@ TEST_F(MediaPlayerBridgeTest, ClientOnVideoSizeChanged) {
   SimulateVideoSizeChanged(kWidth, kHeight);
 }
 
-TEST_F(MediaPlayerBridgeTest, ClientOnPlaybackComplete) {
+TEST_F(MediaPlayerBridgeTest, Client_OnPlaybackComplete) {
   EXPECT_CALL(client_, OnPlaybackComplete());
 
   SimulatePlaybackCompleted();
 }
 
-TEST_F(MediaPlayerBridgeTest, ClientOnError) {
+TEST_F(MediaPlayerBridgeTest, Client_OnError) {
   // MEDIA_ERROR_INVALID_CODE should still be propagated.
   EXPECT_CALL(client_, OnError(_)).Times(1);
   SimulateError(MediaPlayerBridge::MediaErrorType::MEDIA_ERROR_INVALID_CODE);

media/base/android/media_service_throttler_unittest.cc

@@ -76,7 +76,7 @@ TEST_F(MediaServiceThrottlerTest, BaseCase) {
 }
 
 // Makes sure we can "burst" schedule clients.
-TEST_F(MediaServiceThrottlerTest, NoCrashUnderBurstThresholdShouldNotDelay) {
+TEST_F(MediaServiceThrottlerTest, NoCrash_UnderBurstThreshold_ShouldNotDelay) {
   int number_burst_client_scheduled = 0;
 
   while (base::TimeDelta() == throttler_->GetDelayForClientCreation())
@@ -87,7 +87,7 @@ TEST_F(MediaServiceThrottlerTest, NoCrashUnderBurstThresholdShouldNotDelay) {
 
 // Makes sure that, when burst scheduling a client, we schedule it from
 // last scheduled burst client (vs scheduling it |base_delay_| from now).
-TEST_F(MediaServiceThrottlerTest, NoCrashOverBurstThresholdShouldDelay) {
+TEST_F(MediaServiceThrottlerTest, NoCrash_OverBurstThreshold_ShouldDelay) {
   // Schedule clients until the next one would be over burst threshold.
   SimulateClientCreations(kMaxBurstClients);
 
@@ -141,7 +141,7 @@ TEST_F(MediaServiceThrottlerTest,
 
 // Makes sure that after a certain amount of inactivity, the scheduling clock is
 // reset.
-TEST_F(MediaServiceThrottlerTest, NoCrashLongInactivityShouldReset) {
+TEST_F(MediaServiceThrottlerTest, NoCrash_LongInactivity_ShouldReset) {
   // Schedule two minutes' worth of clients.
   SimulateClientCreations(base::ClampFloor(base::Minutes(2) / base_delay_));
 
@@ -153,7 +153,7 @@ TEST_F(MediaServiceThrottlerTest, NoCrashLongInactivityShouldReset) {
 }
 
 // Makes sure that crashes increase the scheduling delay.
-TEST_F(MediaServiceThrottlerTest, WithCrashBaseCaseDelayShouldIncrease) {
+TEST_F(MediaServiceThrottlerTest, WithCrash_BaseCase_DelayShouldIncrease) {
   // Schedule clients until the next one would be over burst threshold.
   SimulateClientCreations(kMaxBurstClients);
 
@@ -182,7 +182,7 @@ TEST_F(MediaServiceThrottlerTest,
 }
 
 // Makes sure that more than 1 crash per minute causes increased delays.
-TEST_F(MediaServiceThrottlerTest, WithCrashManyCrashesDelayShouldIncrease) {
+TEST_F(MediaServiceThrottlerTest, WithCrash_ManyCrashes_DelayShouldIncrease) {
   // Schedule clients until the next one would be over burst threshold.
   SimulateClientCreations(kMaxBurstClients);
 
@@ -210,7 +210,7 @@ TEST_F(MediaServiceThrottlerTest,
 }
 
 // Makes sure that crashes affect the number of burst clients we can schedule.
-TEST_F(MediaServiceThrottlerTest, WithCrashShouldAllowFewerBurstClients) {
+TEST_F(MediaServiceThrottlerTest, WithCrash_ShouldAllowFewerBurstClients) {
   int number_burst_client_scheduled = 0;
 
   SimulateCrashes(1);
@@ -222,7 +222,7 @@ TEST_F(MediaServiceThrottlerTest, WithCrashShouldAllowFewerBurstClients) {
 }
 
 // Makes sure delays are capped to a certain maximal value.
-TEST_F(MediaServiceThrottlerTest, WithCrashManyCrashesDelayShouldMaxOut) {
+TEST_F(MediaServiceThrottlerTest, WithCrash_ManyCrashes_DelayShouldMaxOut) {
   // Schedule clients until the next one would be over burst threshold.
   SimulateClientCreations(kMaxBurstClients);
 
@@ -235,7 +235,7 @@ TEST_F(MediaServiceThrottlerTest, WithCrashManyCrashesDelayShouldMaxOut) {
 }
 
 // Makes sure a minute without crashes resets the crash counter.
-TEST_F(MediaServiceThrottlerTest, WithCrashNoCrashesForAMinuteShouldReset) {
+TEST_F(MediaServiceThrottlerTest, WithCrash_NoCrashesForAMinute_ShouldReset) {
   SimulateCrashes(10);
 
   // The effective server crash count should be reset because it has been over
@@ -248,7 +248,7 @@ TEST_F(MediaServiceThrottlerTest, WithCrashNoCrashesForAMinuteShouldReset) {
 }
 
 // Makes sure a steady crashes do not resets the crash counter.
-TEST_F(MediaServiceThrottlerTest, WithCrashConstantCrashesShouldNotReset) {
+TEST_F(MediaServiceThrottlerTest, WithCrash_ConstantCrashes_ShouldNotReset) {
   SimulateCrashes(9);
 
   // The effective server crash count should not be reset.
@@ -263,7 +263,7 @@ TEST_F(MediaServiceThrottlerTest, WithCrashConstantCrashesShouldNotReset) {
 
 // Makes sure the crash listener shuts down after a minute of not having
 // received any client creation request.
-TEST_F(MediaServiceThrottlerTest, CrashListenerNoRequestsShouldShutDown) {
+TEST_F(MediaServiceThrottlerTest, CrashListener_NoRequests_ShouldShutDown) {
   // Schedule many minutes worth of clients. This is to prove that the
   // MediaServerCrashListener's clean up happens after lack of requests, as
   // opposed to lack of actually scheduled clients.

media/base/audio_buffer_converter_unittest.cc

@@ -113,13 +113,13 @@ TEST_F(AudioBufferConverterTest, Upsample) {
 }
 
 // Test resampling a buffer smaller than the SincResampler's kernel size.
-TEST_F(AudioBufferConverterTest, ResampleTinyBuffer) {
+TEST_F(AudioBufferConverterTest, Resample_TinyBuffer) {
   AddInput(MakeTestBuffer(48000, CHANNEL_LAYOUT_STEREO, 2,
                           SincResampler::kMinKernelSize - 1));
   ConsumeAllOutput();
 }
 
-TEST_F(AudioBufferConverterTest, ResampleDifferingBufferSizes) {
+TEST_F(AudioBufferConverterTest, Resample_DifferingBufferSizes) {
   const int input_sample_rate = 48000;
   AddInput(MakeTestBuffer(
       input_sample_rate, kOutChannelLayout, kOutChannelCount, 100));
@@ -155,25 +155,25 @@ TEST_F(AudioBufferConverterTest, ResampleAndRemix) {
   ConsumeAllOutput();
 }
 
-TEST_F(AudioBufferConverterTest, ConfigChangeSampleRate) {
+TEST_F(AudioBufferConverterTest, ConfigChange_SampleRate) {
   AddInput(MakeTestBuffer(48000, kOutChannelLayout, kOutChannelCount, 512));
   AddInput(MakeTestBuffer(44100, kOutChannelLayout, kOutChannelCount, 512));
   ConsumeAllOutput();
 }
 
-TEST_F(AudioBufferConverterTest, ConfigChangeChannelLayout) {
+TEST_F(AudioBufferConverterTest, ConfigChange_ChannelLayout) {
   AddInput(MakeTestBuffer(kOutSampleRate, CHANNEL_LAYOUT_STEREO, 2, 512));
   AddInput(MakeTestBuffer(kOutSampleRate, CHANNEL_LAYOUT_MONO, 1, 512));
   ConsumeAllOutput();
 }
 
-TEST_F(AudioBufferConverterTest, ConfigChangeSampleRateAndChannelLayout) {
+TEST_F(AudioBufferConverterTest, ConfigChange_SampleRateAndChannelLayout) {
   AddInput(MakeTestBuffer(44100, CHANNEL_LAYOUT_STEREO, 2, 512));
   AddInput(MakeTestBuffer(48000, CHANNEL_LAYOUT_MONO, 1, 512));
   ConsumeAllOutput();
 }
 
-TEST_F(AudioBufferConverterTest, ConfigChangeMultiple) {
+TEST_F(AudioBufferConverterTest, ConfigChange_Multiple) {
   AddInput(MakeTestBuffer(44100, CHANNEL_LAYOUT_STEREO, 2, 512));
   AddInput(MakeTestBuffer(48000, CHANNEL_LAYOUT_MONO, 1, 512));
   AddInput(MakeTestBuffer(44100, CHANNEL_LAYOUT_5_1, 6, 512));