Migrate tests to use EXPECT_DCHECK_DEATH instead of EXPECT_DEATH.

chrome/browser/prefs/incognito_mode_prefs_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 "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"
 
 class IncognitoModePrefsTest : public testing::Test {
  protected:
   void SetUp() override {
     IncognitoModePrefs::RegisterProfilePrefs(prefs_.registry());
   }
 
@@ skipping 31 matching lines @@
             IncognitoModePrefs::GetAvailability(&prefs_));
 
   prefs_.SetUserPref(prefs::kIncognitoModeAvailability,
                      new base::FundamentalValue(IncognitoModePrefs::FORCED));
   EXPECT_EQ(IncognitoModePrefs::FORCED,
             IncognitoModePrefs::GetAvailability(&prefs_));
 }
 
 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