| Index: chrome/test/base/tracing_browsertest.cc
|
| diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc
|
| index d29f07c007f860864f3c3ff1cf69a389137425a6..496d4586d5541566d0a614d4fdbda3499c50d104 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.
|
| // Flaky (leaking) on linux_chromium_asan_rel_ng: https://crbug.com/585026
|
| -#if defined(ADDRESS_SANITIZER)
|
| +// and Windows https://crbug.com/594884
|
| +#if defined(ADDRESS_SANITIZER) || defined(OS_WIN)
|
| #define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra
|
| #else
|
| #define MAYBE_TestMemoryInfra TestMemoryInfra
|
|
|