Migrate tests to use EXPECT_DCHECK_DEATH instead of EXPECT_DEATH.

chrome/browser/prefs/incognito_mode_prefs_unittest.cc

Index: chrome/browser/prefs/incognito_mode_prefs_unittest.cc
diff --git a/chrome/browser/prefs/incognito_mode_prefs_unittest.cc b/chrome/browser/prefs/incognito_mode_prefs_unittest.cc
index 9b2492a0df82a65f4e4c5f310502bcdcb1894157..7637c6fdb2031e5d2604ac04475902e3f4475f6c 100644
--- a/chrome/browser/prefs/incognito_mode_prefs_unittest.cc
+++ b/chrome/browser/prefs/incognito_mode_prefs_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 
+#include "base/test/gtest_util.h"
 #include "chrome/common/pref_names.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -55,22 +56,12 @@ TEST_F(IncognitoModePrefsTest, GetAvailability) {
 
 typedef IncognitoModePrefsTest IncognitoModePrefsDeathTest;
 
-#if GTEST_HAS_DEATH_TEST
 TEST_F(IncognitoModePrefsDeathTest, GetAvailabilityBadValue) {
   prefs_.SetUserPref(prefs::kIncognitoModeAvailability,
                      new base::FundamentalValue(-1));
-#if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)
-  EXPECT_DEATH({
+  EXPECT_DCHECK_DEATH({
     IncognitoModePrefs::Availability availability =
         IncognitoModePrefs::GetAvailability(&prefs_);
     EXPECT_EQ(IncognitoModePrefs::ENABLED, availability);
-  }, "");
-#else
-  EXPECT_DEBUG_DEATH({
-    IncognitoModePrefs::Availability availability =
-        IncognitoModePrefs::GetAvailability(&prefs_);
-    EXPECT_EQ(IncognitoModePrefs::ENABLED, availability);
-  }, "");
-#endif
+  });
 }
-#endif  // GTEST_HAS_DEATH_TEST