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

base/test/gtest_util.h

 // Copyright 2014 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.
 
 #ifndef BASE_TEST_GTEST_UTIL_H_
 #define BASE_TEST_GTEST_UTIL_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/logging.h"
+#include "build/build_config.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+// EXPECT/ASSERT_DCHECK_DEATH is intended to replace EXPECT/ASSERT_DEBUG_DEATH
+// when the death is expected to be caused by a DCHECK. Contrary to
+// EXPECT/ASSERT_DEBUG_DEATH however, it doesn't execute the statement in non-
+// dcheck builds as DCHECKs are intended to catch things that should never
+// happen and as such executing the statement results in undefined behavior
+// (|statement| is compiled in unsupported configurations nonetheless).
+// Death tests misbehave on Android.
+#if DCHECK_IS_ON() && defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID)
+#define EXPECT_DCHECK_DEATH(statement, regex) EXPECT_DEATH(statement, regex)
+#define ASSERT_DCHECK_DEATH(statement, regex) ASSERT_DEATH(statement, regex)
+#else
+#define EXPECT_DCHECK_DEATH(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, )
+#define ASSERT_DCHECK_DEATH(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST(statement, regex, return)

[gab, 2016/07/20 21:21:08]

This won't compile, locally I moved this from
testing/gtest/include/gtest/internal/gtest-death-test-internal.h to
gtest-death-test.h as it was only defined for !GTEST_HAS_DEATH_TEST and we need
it in a broader context (and I think it makes sense for gtest to support our use
case of wanting a different "death scope").

But I don't see how to make the change in gtest/ -- it's a separate git tree but
git cl upload doesn't work.

I don't need this macro per se but I need a way to refer to |statement| so that
compilations without DCHECKs at least don't complain about unreferenced
variables and ideally compile the code without running it so that people can
write valid code even in configurations DCHECK_DEATH isn't running.

+#endif
 
 namespace base {
 
 class FilePath;
 
 struct TestIdentifier {
   TestIdentifier();
   TestIdentifier(const TestIdentifier& other);
 
   std::string test_case_name;
@@ skipping 17 matching lines @@
 
 // Reads the list of gtest-based tests from |path| into |output|.
 // Returns true on success.
 bool ReadTestNamesFromFile(
     const FilePath& path,
     std::vector<TestIdentifier>* output) WARN_UNUSED_RESULT;
 
 }  // namespace base
 
 #endif  // BASE_TEST_GTEST_UTIL_H_