Index: base/synchronization/atomic_flag_unittest.cc |
diff --git a/base/synchronization/atomic_flag_unittest.cc b/base/synchronization/atomic_flag_unittest.cc |
index b0dfd47e4653970789739e24126946bd5c790a1f..c9b166aad4ddc917a43ba2ea15cab60cfe2dad21 100644 |
--- a/base/synchronization/atomic_flag_unittest.cc |
+++ b/base/synchronization/atomic_flag_unittest.cc |
@@ -8,20 +8,12 @@ |
#include "base/logging.h" |
#include "base/single_thread_task_runner.h" |
#include "base/synchronization/waitable_event.h" |
+#include "base/test/gtest_util.h" |
#include "base/threading/platform_thread.h" |
#include "base/threading/thread.h" |
#include "build/build_config.h" |
#include "testing/gtest/include/gtest/gtest.h" |
-// Death tests misbehave on Android. |
-// TODO(fdoray): Remove this when https://codereview.chromium.org/2162053006 |
-// lands. |
-#if DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID) |
-#define EXPECT_DCHECK_DEATH(statement, regex) EXPECT_DEATH(statement, regex) |
-#else |
-#define EXPECT_DCHECK_DEATH(statement, regex) |
-#endif |
- |
namespace base { |
namespace { |