Index: base/trace_event/memory_dump_manager_unittest.cc |
diff --git a/base/trace_event/memory_dump_manager_unittest.cc b/base/trace_event/memory_dump_manager_unittest.cc |
index b7bd426990616c3c817452f86791b59b3e67e01c..86c90d43f05261aa90f97e2eebb4fb2316cd37db 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 @@ TEST_F(MemoryDumpManagerTest, MultipleDumpers) { |
// 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 @@ TEST_F(MemoryDumpManagerTest, TraceConfigExpectationsWhenIsCoordinator) { |
// 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); |