Add ASSERT_DEATH_CHECK() to do ASSERT_DEATH() of CHECK() failures

client/simple_string_dictionary_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "client/simple_string_dictionary.h"
 
 #include "base/logging.h"
 #include "gtest/gtest.h"
+#include "util/test/gtest_death_check.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 TEST(SimpleStringDictionary, Entry) {
   using TestMap = TSimpleStringDictionary<5, 9, 15>;
   TestMap map;
 
   const TestMap::Entry* entry = TestMap::Iterator(map).Next();
@@ skipping 243 matching lines @@
   map.SetKeyValue("b", "2");
   map.SetKeyValue("c", "3");
   EXPECT_EQ(2u, map.GetCount());
   EXPECT_FALSE(map.GetValueForKey("c"));
 }
 
 #if DCHECK_IS_ON
 
 TEST(SimpleStringDictionaryDeathTest, NullKey) {
   TSimpleStringDictionary<4, 6, 6> map;
-  ASSERT_DEATH(map.SetKeyValue(nullptr, "hello"), "key");
+  ASSERT_DEATH_CHECK(map.SetKeyValue(nullptr, "hello"), "key");
 
   map.SetKeyValue("hi", "there");
-  ASSERT_DEATH(map.GetValueForKey(nullptr), "key");
+  ASSERT_DEATH_CHECK(map.GetValueForKey(nullptr), "key");
   EXPECT_STREQ("there", map.GetValueForKey("hi"));
 
-  ASSERT_DEATH(map.GetValueForKey(nullptr), "key");
+  ASSERT_DEATH_CHECK(map.GetValueForKey(nullptr), "key");
   map.RemoveKey("hi");
   EXPECT_EQ(0u, map.GetCount());
 }
 
 #endif
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad