| Index: chrome/browser/media/webrtc/webrtc_audio_quality_browsertest.cc
|
| diff --git a/chrome/browser/media/webrtc/webrtc_audio_quality_browsertest.cc b/chrome/browser/media/webrtc/webrtc_audio_quality_browsertest.cc
|
| index 8107494b852a4fe7df29dbdfdbec0877ab1eee6a..c60d4c843bd64b19e7b0e29f14eca85cad65d664 100644
|
| --- a/chrome/browser/media/webrtc/webrtc_audio_quality_browsertest.cc
|
| +++ b/chrome/browser/media/webrtc/webrtc_audio_quality_browsertest.cc
|
| @@ -36,6 +36,10 @@
|
| #include "net/test/embedded_test_server/embedded_test_server.h"
|
| #include "testing/perf/perf_test.h"
|
|
|
| +#if defined(OS_WIN)
|
| +#include "base/win/windows_version.h"
|
| +#endif
|
| +
|
| namespace {
|
|
|
| static const base::FilePath::CharType kReferenceFile[] =
|
| @@ -629,6 +633,12 @@ void MAYBE_WebRtcAudioQualityBrowserTest::SetupAndRecordAudioCall(
|
| const base::FilePath& recording,
|
| const std::string& constraints,
|
| const base::TimeDelta recording_time) {
|
| + if (OnWin7()) {
|
| + // http://crbug.com/677256.
|
| + LOG(ERROR) << "This test is flaky on Windows 7.";
|
| + return;
|
| + }
|
| +
|
| ASSERT_TRUE(embedded_test_server()->Start());
|
| ASSERT_TRUE(test::HasReferenceFilesInCheckout());
|
| ASSERT_TRUE(ForceMicrophoneVolumeTo100Percent());
|
| @@ -661,6 +671,11 @@ void MAYBE_WebRtcAudioQualityBrowserTest::SetupAndRecordAudioCall(
|
| void MAYBE_WebRtcAudioQualityBrowserTest::TestWithFakeDeviceGetUserMedia(
|
| const std::string& constraints,
|
| const std::string& perf_modifier) {
|
| + if (OnWin7()) {
|
| + // http://crbug.com/677256.
|
| + LOG(ERROR) << "This test is flaky on Windows 7.";
|
| + return;
|
| + }
|
| if (OnWin8()) {
|
| // http://crbug.com/379798.
|
| LOG(ERROR) << "This test is not implemented for Windows XP/Win8.";
|
| @@ -686,6 +701,11 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
|
|
|
| IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
|
| MANUAL_TestCallQualityWithAudioFromWebAudio) {
|
| + if (OnWin7()) {
|
| + // http://crbug.com/677256.
|
| + LOG(ERROR) << "This test is flaky on Windows 7.";
|
| + return;
|
| + }
|
| if (OnWin8()) {
|
| // http://crbug.com/379798.
|
| LOG(ERROR) << "This test is not implemented for Windows XP/Win8.";
|
| @@ -761,6 +781,11 @@ void MAYBE_WebRtcAudioQualityBrowserTest::TestAutoGainControl(
|
| const base::FilePath::StringType& reference_filename,
|
| const std::string& constraints,
|
| const std::string& perf_modifier) {
|
| + if (OnWin7()) {
|
| + // http://crbug.com/677256.
|
| + LOG(ERROR) << "This test is flaky on Windows 7.";
|
| + return;
|
| + }
|
| if (OnWin8()) {
|
| // http://crbug.com/379798.
|
| LOG(ERROR) << "This test is not implemented for Windows XP/Win8.";
|
| @@ -801,6 +826,11 @@ void MAYBE_WebRtcAudioQualityBrowserTest::TestAutoGainControl(
|
| // The AGC should apply non-zero gain here.
|
| IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
|
| MANUAL_TestAutoGainControlOnLowAudio) {
|
| + if (OnWin7()) {
|
| + // http://crbug.com/677256.
|
| + LOG(ERROR) << "This test is flaky on Windows 7.";
|
| + return;
|
| + }
|
| ASSERT_NO_FATAL_FAILURE(TestAutoGainControl(
|
| kReferenceFile, kAudioOnlyCallConstraints, "_with_agc"));
|
| }
|
| @@ -808,6 +838,11 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
|
| // Since the AGC is off here there should be no gain at all.
|
| IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
|
| MANUAL_TestAutoGainIsOffWithAudioProcessingOff) {
|
| + if (OnWin7()) {
|
| + // http://crbug.com/677256.
|
| + LOG(ERROR) << "This test is flaky on Windows 7.";
|
| + return;
|
| + }
|
| const char* kAudioCallWithoutAudioProcessing =
|
| "{audio: { mandatory: { echoCancellation: false } } }";
|
| ASSERT_NO_FATAL_FAILURE(TestAutoGainControl(
|
|
|