| 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..be636d08b7183c1d528685ce7ec31e681d4de324 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_MACOSX)
|
| +#include "base/threading/thread_restrictions.h"
|
| +#endif // defined(OS_MACOSX)
|
| +
|
| namespace {
|
|
|
| static const base::FilePath::CharType kReferenceFile[] =
|
| @@ -681,11 +685,19 @@ void MAYBE_WebRtcAudioQualityBrowserTest::TestWithFakeDeviceGetUserMedia(
|
|
|
| IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
|
| MANUAL_TestCallQualityWithAudioFromFakeDevice) {
|
| +// crbug.com/684680
|
| +#if defined(OS_MACOSX)
|
| + base::ThreadRestrictions::ScopedAllowIO allow_io;
|
| +#endif // defined(OS_MACOSX)
|
| TestWithFakeDeviceGetUserMedia(kAudioOnlyCallConstraints, "_getusermedia");
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
|
| MANUAL_TestCallQualityWithAudioFromWebAudio) {
|
| +// crbug.com/684680
|
| +#if defined(OS_MACOSX)
|
| + base::ThreadRestrictions::ScopedAllowIO allow_io;
|
| +#endif // defined(OS_MACOSX)
|
| if (OnWin8()) {
|
| // http://crbug.com/379798.
|
| LOG(ERROR) << "This test is not implemented for Windows XP/Win8.";
|
| @@ -801,6 +813,10 @@ void MAYBE_WebRtcAudioQualityBrowserTest::TestAutoGainControl(
|
| // The AGC should apply non-zero gain here.
|
| IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcAudioQualityBrowserTest,
|
| MANUAL_TestAutoGainControlOnLowAudio) {
|
| +// crbug.com/684680
|
| +#if defined(OS_MACOSX)
|
| + base::ThreadRestrictions::ScopedAllowIO allow_io;
|
| +#endif // defined(OS_MACOSX)
|
| ASSERT_NO_FATAL_FAILURE(TestAutoGainControl(
|
| kReferenceFile, kAudioOnlyCallConstraints, "_with_agc"));
|
| }
|
| @@ -808,6 +824,10 @@ 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) {
|
| +// crbug.com/684680
|
| +#if defined(OS_MACOSX)
|
| + base::ThreadRestrictions::ScopedAllowIO allow_io;
|
| +#endif // defined(OS_MACOSX)
|
| const char* kAudioCallWithoutAudioProcessing =
|
| "{audio: { mandatory: { echoCancellation: false } } }";
|
| ASSERT_NO_FATAL_FAILURE(TestAutoGainControl(
|
|
|