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

base/metrics/sample_vector_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/metrics/sample_vector.h"
 
 #include <limits.h>
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
 
 #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 {
 namespace {
 
 TEST(SampleVectorTest, AccumulateTest) {
   // Custom buckets: [1, 5) [5, 10)
   BucketRanges ranges(3);
   ranges.set_range(0, 1);
   ranges.set_range(1, 5);
@@ skipping 228 matching lines @@
     EXPECT_EQ(i + 1, max);
     EXPECT_EQ(i, count);
 
     size_t index;
     EXPECT_TRUE(it2->GetBucketIndex(&index));
     EXPECT_EQ(static_cast<size_t>(i), index);
   }
   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);
   ranges.set_range(1, 1);
   ranges.set_range(2, 2);
   ranges.set_range(3, 3);
   ranges.set_range(4, INT_MAX);
   SampleVector samples(1, &ranges);
 
   std::unique_ptr<SampleCountIterator> it = samples.Iterator();
 
   EXPECT_TRUE(it->Done());
 
   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