Move EXPECT_DCHECK_DEATH from base/task_scheduler and use it in relevant base/ tests

base/sequence_checker_unittest.cc

Index: base/sequence_checker_unittest.cc
diff --git a/base/sequence_checker_unittest.cc b/base/sequence_checker_unittest.cc
index 196bb1cc7972309ddba5c85ba42d074ddb3138c3..469605fb9d769d65e1e5da5c4380a5a8d4fadc08 100644
--- a/base/sequence_checker_unittest.cc
+++ b/base/sequence_checker_unittest.cc
@@ -16,6 +16,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
+#include "base/test/gtest_util.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -182,8 +183,6 @@ TEST_F(SequenceCheckerTest, DetachSequenceTokenValid) {
   other_thread()->Stop();
 }
 
-#if GTEST_HAS_DEATH_TEST || !ENABLE_SEQUENCE_CHECKER
-
 void SequenceCheckerTest::MethodOnDifferentThreadDeathTest() {
   std::unique_ptr<SequenceCheckedObject> sequence_checked_object(
       new SequenceCheckedObject);
@@ -198,9 +197,7 @@ void SequenceCheckerTest::MethodOnDifferentThreadDeathTest() {
 TEST_F(SequenceCheckerTest, MethodNotAllowedOnDifferentThreadDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-  ASSERT_DEATH({
-    MethodOnDifferentThreadDeathTest();
-  }, "");
+  ASSERT_DCHECK_DEATH({ MethodOnDifferentThreadDeathTest(); }, "");
 }
 #else
 TEST_F(SequenceCheckerTest, MethodAllowedOnDifferentThreadDeathTestInRelease) {
@@ -227,9 +224,7 @@ void SequenceCheckerTest::DetachThenCallFromDifferentThreadDeathTest() {
 TEST_F(SequenceCheckerTest, DetachFromSequenceDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-  ASSERT_DEATH({
-    DetachThenCallFromDifferentThreadDeathTest();
-  }, "");
+  ASSERT_DCHECK_DEATH({ DetachThenCallFromDifferentThreadDeathTest(); }, "");
 }
 #else
 TEST_F(SequenceCheckerTest, DetachFromThreadDeathTestInRelease) {
@@ -256,9 +251,7 @@ void SequenceCheckerTest::DifferentSequenceTokensDeathTest() {
 TEST_F(SequenceCheckerTest, DifferentSequenceTokensDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-  ASSERT_DEATH({
-    DifferentSequenceTokensDeathTest();
-  }, "");
+  ASSERT_DCHECK_DEATH({ DifferentSequenceTokensDeathTest(); }, "");
 }
 #else
 TEST_F(SequenceCheckerTest, DifferentSequenceTokensDeathTestInRelease) {
@@ -283,9 +276,7 @@ void SequenceCheckerTest::WorkerPoolAndSimpleThreadDeathTest() {
 TEST_F(SequenceCheckerTest, WorkerPoolAndSimpleThreadDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-  ASSERT_DEATH({
-    WorkerPoolAndSimpleThreadDeathTest();
-  }, "");
+  ASSERT_DCHECK_DEATH({ WorkerPoolAndSimpleThreadDeathTest(); }, "");
 }
 #else
 TEST_F(SequenceCheckerTest, WorkerPoolAndSimpleThreadDeathTestInRelease) {
@@ -315,9 +306,7 @@ void SequenceCheckerTest::TwoDifferentWorkerPoolsDeathTest() {
 TEST_F(SequenceCheckerTest, TwoDifferentWorkerPoolsDeathTestInDebug) {
   // The default style "fast" does not support multi-threaded tests.
   ::testing::FLAGS_gtest_death_test_style = "threadsafe";
-  ASSERT_DEATH({
-    TwoDifferentWorkerPoolsDeathTest();
-  }, "");
+  ASSERT_DCHECK_DEATH({ TwoDifferentWorkerPoolsDeathTest(); }, "");
 }
 #else
 TEST_F(SequenceCheckerTest, TwoDifferentWorkerPoolsDeathTestInRelease) {
@@ -325,8 +314,6 @@ TEST_F(SequenceCheckerTest, TwoDifferentWorkerPoolsDeathTestInRelease) {
 }
 #endif  // ENABLE_SEQUENCE_CHECKER
 
-#endif  // GTEST_HAS_DEATH_TEST || !ENABLE_SEQUENCE_CHECKER
-
 }  // namespace
 
 }  // namespace base