Reland of Adding a some checks and switching out a few assert for RTC_[D]CHECK.

webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc

Index: webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
diff --git a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
index 470f690ed9c131825c07af5d2c9fa5f45bb04a0a..ba4be60d1d8d6e04b4616a91ead354d83e32c13d 100644
--- a/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
+++ b/webrtc/modules/audio_coding/acm2/audio_coding_module_unittest_oldapi.cc
@@ -309,11 +309,14 @@
   EXPECT_EQ(kSampleRateHz, audio_frame.sample_rate_hz_);
 }
 
+#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 TEST_F(AudioCodingModuleTestOldApi, FailOnZeroDesiredFrequency) {
   AudioFrame audio_frame;
   bool muted;
-  EXPECT_EQ(-1, acm_->PlayoutData10Ms(0, &audio_frame, &muted));
-}
+  EXPECT_DEATH(acm_->PlayoutData10Ms(0, &audio_frame, &muted),
+               "dst_sample_rate_hz");
+}
+#endif
 
 // Checks that the transport callback is invoked once for each speech packet.
 // Also checks that the frame type is kAudioFrameSpeech.