| Index: chrome/test/base/tracing_browsertest.cc
|
| diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc
|
| index eae1cd38718054aaef35ca6b6b2aec56c6e1e035..5347d14333a0b8a58bfb0deee8214f5802111691 100644
|
| --- a/chrome/test/base/tracing_browsertest.cc
|
| +++ b/chrome/test/base/tracing_browsertest.cc
|
| @@ -101,7 +101,13 @@ class TracingBrowserTest : public InProcessBrowserTest {
|
| }
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) {
|
| +// crbug.com/708487.
|
| +#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra
|
| +#else
|
| +#define MAYBE_TestMemoryInfra TestMemoryInfra
|
| +#endif // defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
|
| +IN_PROC_BROWSER_TEST_F(TracingBrowserTest, MAYBE_TestMemoryInfra) {
|
| PerformDumpMemoryTestActions(
|
| base::trace_event::TraceConfig(
|
| base::trace_event::TraceConfigMemoryTestUtil::
|
|
|