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

Unified Diff: chrome/browser/media/webrtc/webrtc_internals_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_internals_perf_browsertest.cc
diff --git a/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc b/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc
index beb8f6b5285e64f09c23cb045bd5797a7f4fab65..07894b6d85c9eeb74c9cfe83768b8abf2201606e 100644
--- a/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc
+++ b/chrome/browser/media/webrtc/webrtc_internals_perf_browsertest.cc
@@ -29,6 +29,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)
+
static const char kMainWebrtcTestHtmlPage[] =
"/webrtc/webrtc_jsep01_test.html";
@@ -226,12 +230,20 @@ class WebRtcInternalsPerfBrowserTest : public WebRtcTestBase {
IN_PROC_BROWSER_TEST_F(
WebRtcInternalsPerfBrowserTest,
MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp8) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsAudioVideoCall60SecsAndLogsInternalMetrics("VP8");
}
IN_PROC_BROWSER_TEST_F(
WebRtcInternalsPerfBrowserTest,
MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsVp9) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsAudioVideoCall60SecsAndLogsInternalMetrics("VP9");
}
@@ -248,6 +260,10 @@ IN_PROC_BROWSER_TEST_F(
IN_PROC_BROWSER_TEST_F(
WebRtcInternalsPerfBrowserTest,
MAYBE_MANUAL_RunsAudioVideoCall60SecsAndLogsInternalMetricsH264) {
+// 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. "
@@ -264,11 +280,19 @@ IN_PROC_BROWSER_TEST_F(
IN_PROC_BROWSER_TEST_F(
WebRtcInternalsPerfBrowserTest,
MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsDefault) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsOneWayCall60SecsAndLogsInternalMetrics("", false);
}
IN_PROC_BROWSER_TEST_F(
WebRtcInternalsPerfBrowserTest,
MANUAL_RunsOneWayCall60SecsAndLogsInternalMetricsWithOpusDtx) {
+// crbug.com/684680
+#if defined(OS_MACOSX)
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
+#endif // defined(OS_MACOSX)
RunsOneWayCall60SecsAndLogsInternalMetrics("", true);
}

Powered by Google App Engine
This is Rietveld 408576698