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

base/message_loop/message_pump_io_ios_unittest.cc

 // Copyright 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/message_loop/message_pump_io_ios.h"
 
 #include <unistd.h>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/posix/eintr_wrapper.h"
+#include "base/test/gtest_util.h"
 #include "base/threading/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 class MessagePumpIOSForIOTest : public testing::Test {
  protected:
   MessagePumpIOSForIOTest()
       : ui_loop_(MessageLoop::TYPE_UI),
         io_thread_("MessagePumpIOSForIOTestIOThread") {}
@@ skipping 43 matching lines @@
 // nothing useful.
 class StupidWatcher : public MessagePumpIOSForIO::Watcher {
  public:
   ~StupidWatcher() override {}
 
   // base:MessagePumpIOSForIO::Watcher interface
   void OnFileCanReadWithoutBlocking(int fd) override {}
   void OnFileCanWriteWithoutBlocking(int fd) override {}
 };
 
-#if GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
-
-// Test to make sure that we catch calling WatchFileDescriptor off of the
-//  wrong thread.
+// Test to make sure that we catch calling WatchFileDescriptor off of the wrong
+// thread.
 TEST_F(MessagePumpIOSForIOTest, TestWatchingFromBadThread) {
   MessagePumpIOSForIO::FileDescriptorWatcher watcher;
   StupidWatcher delegate;
 
-  ASSERT_DEBUG_DEATH(io_loop()->WatchFileDescriptor(
-      STDOUT_FILENO, false, MessageLoopForIO::WATCH_READ, &watcher, &delegate),
+  ASSERT_DCHECK_DEATH(
+      io_loop()->WatchFileDescriptor(STDOUT_FILENO, false,
+                                     MessageLoopForIO::WATCH_READ, &watcher,
+                                     &delegate),
       "Check failed: "
       "watch_file_descriptor_caller_checker_.CalledOnValidThread\\(\\)");
 }
 
-#endif  // GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
-
 class BaseWatcher : public MessagePumpIOSForIO::Watcher {
  public:
   BaseWatcher(MessagePumpIOSForIO::FileDescriptorWatcher* controller)
       : controller_(controller) {
     DCHECK(controller_);
   }
   ~BaseWatcher() override {}
 
   // MessagePumpIOSForIO::Watcher interface
   void OnFileCanReadWithoutBlocking(int /* fd */) override { NOTREACHED(); }
@@ skipping 73 matching lines @@
   pump->WatchFileDescriptor(pipefds_[1],
       false, MessagePumpIOSForIO::WATCH_READ_WRITE, &watcher, &delegate);
 
   // Spoof a callback.
   HandleFdIOEvent(&watcher);
 }
 
 }  // namespace
 
 }  // namespace base