summaryrefslogtreecommitdiff
path: root/chromium/content/browser/webrtc/webrtc_browsertest.cc
diff options
context:
space:
mode:
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});");