memory-infra: Disable two MemoryDumpManager tests on iOS
The tests seem to be flaky and we are about to restructure the
MemoryDumpManager to not know about tracing so it doesn't seem
worth hunting down the cause.
R=primiano@chromium.org
BUG=706961
Review-Url: https://codereview.chromium.org/2787823004
Cr-Commit-Position: refs/heads/master@{#461093}
CrOS-Libchrome-Original-Commit: 9770fad0b3ebe389c34672dc8797bf8fbffeda9b
diff --git a/base/trace_event/memory_dump_manager_unittest.cc b/base/trace_event/memory_dump_manager_unittest.cc
index b7bd426..86c90d4 100644
--- a/base/trace_event/memory_dump_manager_unittest.cc
+++ b/base/trace_event/memory_dump_manager_unittest.cc
@@ -32,6 +32,7 @@
#include "base/trace_event/process_memory_dump.h"
#include "base/trace_event/trace_buffer.h"
#include "base/trace_event/trace_config_memory_test_util.h"
+#include "build/build_config.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -439,8 +440,13 @@
// Checks that the dump provider invocations depend only on the current
// registration state and not on previous registrations and dumps.
-// flaky: crbug.com/706874
-TEST_F(MemoryDumpManagerTest, DISABLED_RegistrationConsistency) {
+// Flaky on iOS, see crbug.com/706874
+#if defined(OS_IOS)
+#define MAYBE_RegistrationConsistency DISABLED_RegistrationConsistency
+#else
+#define MAYBE_RegistrationConsistency RegistrationConsistency
+#endif
+TEST_F(MemoryDumpManagerTest, MAYBE_RegistrationConsistency) {
InitializeMemoryDumpManager(false /* is_coordinator */);
MockMemoryDumpProvider mdp;
@@ -1014,8 +1020,13 @@
// Tests against race conditions that might arise when disabling tracing in the
// middle of a global memory dump.
-// flaky: crbug.com/706874
-TEST_F(MemoryDumpManagerTest, DISABLED_DisableTracingWhileDumping) {
+// Flaky on iOS, see crbug.com/706961
+#if defined(OS_IOS)
+#define MAYBE_DisableTracingWhileDumping DISABLED_DisableTracingWhileDumping
+#else
+#define MAYBE_DisableTracingWhileDumping DisableTracingWhileDumping
+#endif
+TEST_F(MemoryDumpManagerTest, MAYBE_DisableTracingWhileDumping) {
base::WaitableEvent tracing_disabled_event(
WaitableEvent::ResetPolicy::AUTOMATIC,
WaitableEvent::InitialState::NOT_SIGNALED);