| Index: chrome/test/base/tracing_browsertest.cc
|
| diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc
|
| index c5df112331f0501c248db1eecbae225e1f61c8b1..5357049fb6a68e05745939126fabfc73c64e59fe 100644
|
| --- a/chrome/test/base/tracing_browsertest.cc
|
| +++ b/chrome/test/base/tracing_browsertest.cc
|
| @@ -107,7 +107,13 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) {
|
| base::trace_event::MemoryDumpLevelOfDetail::DETAILED);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestBackgroundMemoryInfra) {
|
| +// crbug.com/708487.
|
| +#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_TestBackgroundMemoryInfra DISABLED_TestBackgroundMemoryInfra
|
| +#else
|
| +#define MAYBE_TestBackgroundMemoryInfra TestBackgroundMemoryInfra
|
| +#endif // defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
|
| +IN_PROC_BROWSER_TEST_F(TracingBrowserTest, MAYBE_TestBackgroundMemoryInfra) {
|
| PerformDumpMemoryTestActions(
|
| base::trace_event::TraceConfig(
|
| base::trace_event::TraceConfigMemoryTestUtil::
|
|
|