| Index: chrome/test/base/tracing_browsertest.cc
|
| diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc
|
| index 3ba53ca1c43aebeb81165f1aeeeb622d6c170dec..009c89237e3447f905ef45134802c4a2568ab327 100644
|
| --- a/chrome/test/base/tracing_browsertest.cc
|
| +++ b/chrome/test/base/tracing_browsertest.cc
|
| @@ -170,14 +170,10 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, DISABLED_TestMemoryInfra) {
|
| }
|
|
|
| // Single-process mode.
|
| -// Flaky (leaking) on linux_chromium_asan_rel_ng: https://crbug.com/585026
|
| -// and Linux/Windows: https://crbug.com/594884
|
| -#if defined(ADDRESS_SANITIZER) || defined(OS_WIN) || defined(OS_LINUX)
|
| -#define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra
|
| -#else
|
| -#define MAYBE_TestMemoryInfra TestMemoryInfra
|
| -#endif
|
| -IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, MAYBE_TestMemoryInfra) {
|
| +// Flaky on Windows and Linux: https://crbug.com/594884
|
| +// Linux ASan: https://crbug.com/585026
|
| +IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest,
|
| + DISABLED_TestMemoryInfra) {
|
| PerformDumpMemoryTestActions();
|
| }
|
|
|
|
|