| Index: chrome/test/base/tracing_browsertest.cc
|
| diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc
|
| index dfd735628cc9978ee7af2bf21064df37043b8ba3..656f7577fc1c8f12a51bbe673d75fea29ad22ed1 100644
|
| --- a/chrome/test/base/tracing_browsertest.cc
|
| +++ b/chrome/test/base/tracing_browsertest.cc
|
| @@ -170,7 +170,8 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) {
|
|
|
| // Single-process mode.
|
| // Linux ASan: https://crbug.com/585026.
|
| -#if defined(ADDRESS_SANITIZER)
|
| +// Linux https://crbug/619515.
|
| +#if defined(ADDRESS_SANITIZER) || defined(OS_LINUX)
|
| #define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra
|
| #else
|
| #define MAYBE_TestMemoryInfra TestMemoryInfra
|
|
|