| Index: chrome/test/base/tracing_browsertest.cc
|
| diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc
|
| index 6995606989dc1aeb51151f677f2ed677b203caf0..d29f07c007f860864f3c3ff1cf69a389137425a6 100644
|
| --- a/chrome/test/base/tracing_browsertest.cc
|
| +++ b/chrome/test/base/tracing_browsertest.cc
|
| @@ -169,7 +169,13 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) {
|
| }
|
|
|
| // Single-process mode.
|
| -IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, TestMemoryInfra) {
|
| +// Flaky (leaking) on linux_chromium_asan_rel_ng: https://crbug.com/585026
|
| +#if defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra
|
| +#else
|
| +#define MAYBE_TestMemoryInfra TestMemoryInfra
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, MAYBE_TestMemoryInfra) {
|
| PerformDumpMemoryTestActions();
|
| }
|
|
|
|
|