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

base/metrics/field_trial_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/field_trial.h"
 
 #include <stddef.h>
 
 #include "base/build_time.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
+#include "base/test/gtest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 namespace {
 
 // Default group name used by several tests.
 const char kDefaultGroupName[] = "DefaultGroup";
 
 // Call FieldTrialList::FactoryGetFieldTrial() with a future expiry date.
@@ skipping 1087 matching lines @@
   FieldTrial::ActiveGroups active_groups;
   field_trial_list.GetActiveFieldTrialGroups(&active_groups);
   ASSERT_EQ(2U, active_groups.size());
   EXPECT_EQ("Abc", active_groups[0].trial_name);
   EXPECT_EQ("cba", active_groups[0].group_name);
   EXPECT_EQ("Xyz", active_groups[1].trial_name);
   EXPECT_EQ("zyx", active_groups[1].group_name);
   EXPECT_TRUE(field_trial_list.TrialExists("zzz"));
 }
 
-#if GTEST_HAS_DEATH_TEST
 TEST(FieldTrialDeathTest, OneTimeRandomizedTrialWithoutFieldTrialList) {
   // Trying to instantiate a one-time randomized field trial before the
   // FieldTrialList is created should crash.
-  EXPECT_DEATH(FieldTrialList::FactoryGetFieldTrial(
-      "OneTimeRandomizedTrialWithoutFieldTrialList", 100, kDefaultGroupName,
-      base::FieldTrialList::kNoExpirationYear, 1, 1,
-      base::FieldTrial::ONE_TIME_RANDOMIZED, NULL), "");
+  EXPECT_DCHECK_DEATH(
+      FieldTrialList::FactoryGetFieldTrial(
+          "OneTimeRandomizedTrialWithoutFieldTrialList", 100, kDefaultGroupName,
+          base::FieldTrialList::kNoExpirationYear, 1, 1,
+          base::FieldTrial::ONE_TIME_RANDOMIZED, NULL),
+      "");
 }
-#endif
 
 }  // namespace base