Index: content/browser/tracing/background_tracing_manager_browsertest.cc |
diff --git a/content/browser/tracing/background_tracing_manager_browsertest.cc b/content/browser/tracing/background_tracing_manager_browsertest.cc |
index af69655408084b00e4ff5b0363bac593185af3d9..5dad1c822515bbbdf30f169a8f79ff5c2a32021d 100644 |
--- a/content/browser/tracing/background_tracing_manager_browsertest.cc |
+++ b/content/browser/tracing/background_tracing_manager_browsertest.cc |
@@ -321,12 +321,21 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest, |
EXPECT_TRUE(upload_config_wrapper.TraceHasMatchingString("user-agent")); |
} |
+#if defined(OS_ANDROID) |
+// Flaky on android: https://crbug.com/639706 |
+#define MAYBE_CrashWhenSubprocessWithoutArgumentFilter \ |
+ DISABLED_CrashWhenSubprocessWithoutArgumentFilter |
+#else |
+#define MAYBE_CrashWhenSubprocessWithoutArgumentFilter \ |
+ CrashWhenSubprocessWithoutArgumentFilter |
+#endif |
+ |
// This tests subprocesses (like a navigating renderer) which gets told to |
// provide a argument-filtered trace and has no predicate in place to do the |
// filtering (in this case, only the browser process gets it set), will crash |
// rather than return potential PII. |
IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest, |
- CrashWhenSubprocessWithoutArgumentFilter) { |
+ MAYBE_CrashWhenSubprocessWithoutArgumentFilter) { |
SetupBackgroundTracingManager(); |
base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate( |