Re-enable TestMemoryInfra browser tests

chrome/test/base/tracing_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/tracing.h"
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 146 matching lines @@
       NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ASSERT_NO_FATAL_FAILURE(ExecuteJavascriptOnCurrentTab());
   ui_test_utils::NavigateToURLWithDisposition(browser(), url2,
       NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
   ASSERT_NO_FATAL_FAILURE(ExecuteJavascriptOnCurrentTab());
   EXPECT_TRUE(WaitForWatchEvent(no_timeout));
   ASSERT_TRUE(EndTracing(&json_events));
 }
 
 // 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();
 }
 
 }  // namespace