| Index: chrome/test/base/tracing_browsertest.cc
|
| diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc
|
| index 496d4586d5541566d0a614d4fdbda3499c50d104..ab7aca8bf5140ddbbd1ea6872f8762bbf462cf76 100644
|
| --- a/chrome/test/base/tracing_browsertest.cc
|
| +++ b/chrome/test/base/tracing_browsertest.cc
|
| @@ -164,7 +164,8 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, BeginTracingWithWatch) {
|
| }
|
|
|
| // Multi-process mode.
|
| -IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) {
|
| +// Flaky on win and Linux: https://crbug.com/594884.
|
| +IN_PROC_BROWSER_TEST_F(TracingBrowserTest, DISABLED_TestMemoryInfra) {
|
| PerformDumpMemoryTestActions();
|
| }
|
|
|
|
|