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

base/metrics/sample_vector_unittest.cc

Index: base/metrics/sample_vector_unittest.cc
diff --git a/base/metrics/sample_vector_unittest.cc b/base/metrics/sample_vector_unittest.cc
index 02e48aac17c70cc5dcd804cb133ab37b7bd56b43..2d3d922b0da61e0468811ee7374a54149dc6a195 100644
--- a/base/metrics/sample_vector_unittest.cc
+++ b/base/metrics/sample_vector_unittest.cc
@@ -12,6 +12,7 @@
 
 #include "base/metrics/bucket_ranges.h"
 #include "base/metrics/histogram.h"
+#include "base/test/gtest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
@@ -260,8 +261,6 @@ TEST(SampleVectorIteratorTest, IterateTest) {
   EXPECT_EQ(4, i);
 }
 
-#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST
-
 TEST(SampleVectorIteratorDeathTest, IterateDoneTest) {
   BucketRanges ranges(5);
   ranges.set_range(0, 0);
@@ -278,17 +277,14 @@ TEST(SampleVectorIteratorDeathTest, IterateDoneTest) {
   HistogramBase::Sample min;
   HistogramBase::Sample max;
   HistogramBase::Count count;
-  EXPECT_DEATH(it->Get(&min, &max, &count), "");
+  EXPECT_DCHECK_DEATH(it->Get(&min, &max, &count), "");
 
-  EXPECT_DEATH(it->Next(), "");
+  EXPECT_DCHECK_DEATH(it->Next(), "");
 
   samples.Accumulate(2, 100);
   it = samples.Iterator();
   EXPECT_FALSE(it->Done());
 }
 
-#endif
-// (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)) && GTEST_HAS_DEATH_TEST
-
 }  // namespace
 }  // namespace base