summaryrefslogtreecommitdiff
path: root/chromium/content/browser/webrtc/webrtc_browsertest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/content/browser/webrtc/webrtc_browsertest.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/webrtc/webrtc_browsertest.cc')
-rw-r--r--chromium/content/browser/webrtc/webrtc_browsertest.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chromium/content/browser/webrtc/webrtc_browsertest.cc b/chromium/content/browser/webrtc/webrtc_browsertest.cc
index 0799ad37635..a8bf7c382ee 100644
--- a/chromium/content/browser/webrtc/webrtc_browsertest.cc
+++ b/chromium/content/browser/webrtc/webrtc_browsertest.cc
@@ -61,7 +61,15 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CanSetupAudioAndVideoCall) {
MakeTypicalPeerConnectionCall("call({video: true, audio: true});");
}
-IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, NetworkProcessCrashRecovery) {
+#if defined(OS_ANDROID)
+// Flaky on Android https://crbug.com/1099365
+#define MAYBE_NetworkProcessCrashRecovery DISABLED_NetworkProcessCrashRecovery
+#else
+#define MAYBE_NetworkProcessCrashRecovery NetworkProcessCrashRecovery
+#endif
+
+IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
+ MAYBE_NetworkProcessCrashRecovery) {
if (!IsOutOfProcessNetworkService())
return;
MakeTypicalPeerConnectionCall("call({video: true, audio: true});");