Index: chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc |
diff --git a/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc b/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc |
index f7931d2570e33f09a7e91a06348ee37e48a5c5b4..5b941d66568ac80af37ec16179b5fb8af7da338b 100644 |
--- a/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc |
+++ b/chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc |
@@ -39,6 +39,10 @@ |
#include "testing/perf/perf_test.h" |
#include "ui/gl/gl_switches.h" |
+#if defined(OS_MACOSX) |
+#include "base/threading/thread_restrictions.h" |
+#endif // defined(OS_MACOSX) |
+ |
namespace { |
std::string MakeLabel(const char* test_name, const std::string& video_codec) { |
std::string codec_label = video_codec.empty() ? "" : "_" + video_codec; |
@@ -344,11 +348,19 @@ INSTANTIATE_TEST_CASE_P( |
IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, |
MANUAL_TestVideoQualityVp8) { |
+// crbug.com/684680 |
+#if defined(OS_MACOSX) |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
+#endif // defined(OS_MACOSX) |
TestVideoQuality("VP8"); |
} |
IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, |
MANUAL_TestVideoQualityVp9) { |
+// crbug.com/684680 |
+#if defined(OS_MACOSX) |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
+#endif // defined(OS_MACOSX) |
TestVideoQuality("VP9"); |
} |
@@ -356,6 +368,10 @@ IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, |
IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, |
MANUAL_TestVideoQualityH264) { |
+// crbug.com/684680 |
+#if defined(OS_MACOSX) |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
+#endif // defined(OS_MACOSX) |
// Only run test if run-time feature corresponding to |rtc_use_h264| is on. |
if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) { |
LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. " |