Re-enable TestMemoryInfra browser tests

chrome/test/base/tracing_browsertest.cc

Index: chrome/test/base/tracing_browsertest.cc
diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc
index f34d9f1b1cbe2b2e02b8728bd4830209003363f4..dfd735628cc9978ee7af2bf21064df37043b8ba3 100644
--- a/chrome/test/base/tracing_browsertest.cc
+++ b/chrome/test/base/tracing_browsertest.cc
@@ -164,16 +164,18 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, BeginTracingWithWatch) {
 }
 
 // Multi-process mode.
-// Flaky on win and Linux: https://crbug.com/594884.
-IN_PROC_BROWSER_TEST_F(TracingBrowserTest, DISABLED_TestMemoryInfra) {
+IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) {
   PerformDumpMemoryTestActions();
 }
 
 // Single-process mode.
-// Flaky on Windows and Linux: https://crbug.com/594884
-// Linux ASan: https://crbug.com/585026
-IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest,
-    DISABLED_TestMemoryInfra) {
+// Linux ASan: https://crbug.com/585026.
+#if defined(ADDRESS_SANITIZER)
+#define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra
+#else
+#define MAYBE_TestMemoryInfra TestMemoryInfra
+#endif
+IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, MAYBE_TestMemoryInfra) {
   PerformDumpMemoryTestActions();
 }