Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2075)

Unified Diff: chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc

Issue 2840333004: Allow IO thread usage in WebRTC browsertests (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc
diff --git a/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc b/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc
index d3074e8fd76593d6be89178af0d83b1fc4de9ab4..b5d058b4ed151c09d99eb29d5acbb1227b141286 100644
--- a/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_stats_perf_browsertest.cc
@@ -15,6 +15,10 @@
#include "media/base/media_switches.h"
#include "testing/perf/perf_test.h"
+#if defined(OS_MACOSX)
+#include "base/threading/thread_restrictions.h"
+#endif // defined(OS_MACOSX)
+
namespace content {
namespace {
@@ -232,42 +236,70 @@ class WebRtcStatsPerfBrowserTest : public WebRtcTestBase {
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_AudioCodec_opus) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsAudioAndVideoCallCollectingMetrics("opus", kUseDefaultVideoCodec);
}
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_AudioCodec_ISAC) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsAudioAndVideoCallCollectingMetrics("ISAC", kUseDefaultVideoCodec);
}
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_AudioCodec_G722) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsAudioAndVideoCallCollectingMetrics("G722", kUseDefaultVideoCodec);
}
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_AudioCodec_PCMU) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsAudioAndVideoCallCollectingMetrics("PCMU", kUseDefaultVideoCodec);
}
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_AudioCodec_PCMA) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsAudioAndVideoCallCollectingMetrics("PCMA", kUseDefaultVideoCodec);
}
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_VP8) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsAudioAndVideoCallCollectingMetrics(kUseDefaultAudioCodec, "VP8");
}
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_VP9) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsAudioAndVideoCallCollectingMetrics(kUseDefaultAudioCodec, "VP9");
}
@@ -276,6 +308,10 @@ IN_PROC_BROWSER_TEST_F(
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallCollectingMetrics_VideoCodec_H264) {
+// 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. "
@@ -292,6 +328,10 @@ IN_PROC_BROWSER_TEST_F(
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallMeasuringGetStatsPerformance_Promise) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsAudioAndVideoCallMeasuringGetStatsPerformance(
GetStatsVariation::PROMISE_BASED);
}
@@ -299,6 +339,10 @@ IN_PROC_BROWSER_TEST_F(
IN_PROC_BROWSER_TEST_F(
WebRtcStatsPerfBrowserTest,
MANUAL_RunsAudioAndVideoCallMeasuringGetStatsPerformance_Callback) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsAudioAndVideoCallMeasuringGetStatsPerformance(
GetStatsVariation::CALLBACK_BASED);
}

Powered by Google App Engine
This is Rietveld 408576698