| 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 a2dca5a1c69b0d9dcdc8f8dd6492f0a7ecb298a7..ecb55f259fdd9318472e7712c04dc62609c34849 100644
|
| --- a/content/browser/tracing/background_tracing_manager_browsertest.cc
|
| +++ b/content/browser/tracing/background_tracing_manager_browsertest.cc
|
| @@ -354,22 +354,14 @@ IN_PROC_BROWSER_TEST_F(BackgroundTracingManagerBrowserTest,
|
| EXPECT_TRUE(upload_config_wrapper.TraceHasMatchingString("user-agent"));
|
| }
|
|
|
| -#if defined(OS_ANDROID) || defined(OS_LINUX)
|
| -// Flaky on android: https://crbug.com/639706
|
| -// Flaky on android, linux: https://crbug.com/639706
|
| -#define MAYBE_CrashWhenSubprocessWithoutArgumentFilter \
|
| - DISABLED_CrashWhenSubprocessWithoutArgumentFilter
|
| -#else
|
| -#define MAYBE_CrashWhenSubprocessWithoutArgumentFilter \
|
| - CrashWhenSubprocessWithoutArgumentFilter
|
| -#endif
|
| -
|
| +// Flaky on android, linux, and windows: https://crbug.com/639706 and
|
| +// https://crbug.com/643415.
|
| // 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,
|
| - MAYBE_CrashWhenSubprocessWithoutArgumentFilter) {
|
| + DISABLED_CrashWhenSubprocessWithoutArgumentFilter) {
|
| SetupBackgroundTracingManager();
|
|
|
| base::trace_event::TraceLog::GetInstance()->SetArgumentFilterPredicate(
|
|
|