Disable flaky TracingBrowserTest.TestMemoryInfra on all platforms.

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 62 matching lines @@
     std::string json_events;
     ASSERT_TRUE(EndTracing(&json_events));
 
     // Expect the basic memory dumps to be present in the trace.
     EXPECT_NE(std::string::npos, json_events.find("process_totals"));
     EXPECT_NE(std::string::npos, json_events.find("v8"));
     EXPECT_NE(std::string::npos, json_events.find("blink_gc"));
   }
 };
 
-// Flaky on Linux.  http://crbug.com/658054
-#if defined(OS_LINUX)
-#define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra
-#else
-#define MAYBE_TestMemoryInfra TestMemoryInfra
-#endif
-
-IN_PROC_BROWSER_TEST_F(TracingBrowserTest, MAYBE_TestMemoryInfra) {
+// Flaky: http://crbug.com/658054
+IN_PROC_BROWSER_TEST_F(TracingBrowserTest, DISABLED_TestMemoryInfra) {
   PerformDumpMemoryTestActions(base::trace_event::TraceConfig(
       base::trace_event::TraceConfigMemoryTestUtil::
           GetTraceConfig_PeriodicTriggers(250, 2000)));
 }
 
-IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestBackgroundMemoryInfra) {
+// Flaky: http://crbug.com/658054
+IN_PROC_BROWSER_TEST_F(TracingBrowserTest, DISABLED_TestBackgroundMemoryInfra) {
   PerformDumpMemoryTestActions(base::trace_event::TraceConfig(
       base::trace_event::TraceConfigMemoryTestUtil::
           GetTraceConfig_BackgroundTrigger(200)));
 }
 
 }  // namespace