| Index: media/base/key_systems_unittest.cc
 | 
| diff --git a/media/base/key_systems_unittest.cc b/media/base/key_systems_unittest.cc
 | 
| index 44b881939c93424058b09646fdb36c6f94f619a5..619a5c97b17e97a0d876cef6bc14cbb1c332980f 100644
 | 
| --- a/media/base/key_systems_unittest.cc
 | 
| +++ b/media/base/key_systems_unittest.cc
 | 
| @@ -401,8 +401,10 @@ TEST_F(KeySystemsTest, Basic_UnrecognizedKeySystem) {
 | 
|  
 | 
|  #if defined(ENABLE_PEPPER_CDMS)
 | 
|    std::string type;
 | 
| -  EXPECT_DEBUG_DEATH(type = GetPepperType(kUnrecognized),
 | 
| -                     "x-org.example.unrecognized is not a known system");
 | 
| +#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 | 
| +  EXPECT_DEATH(type = GetPepperType(kUnrecognized),
 | 
| +               "x-org.example.unrecognized is not a known system");
 | 
| +#endif
 | 
|    EXPECT_TRUE(type.empty());
 | 
|  #endif
 | 
|  }
 | 
| @@ -418,8 +420,10 @@ TEST_F(KeySystemsTest, Basic_UsesAesDecryptor) {
 | 
|    EXPECT_TRUE(CanUseAesDecryptor(kUsesAes));
 | 
|  #if defined(ENABLE_PEPPER_CDMS)
 | 
|    std::string type;
 | 
| -  EXPECT_DEBUG_DEATH(type = GetPepperType(kUsesAes),
 | 
| -                     "x-org.example.clear is not Pepper-based");
 | 
| +#if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 | 
| +  EXPECT_DEATH(type = GetPepperType(kUsesAes),
 | 
| +               "x-org.example.clear is not Pepper-based");
 | 
| +#endif
 | 
|    EXPECT_TRUE(type.empty());
 | 
|  #endif
 | 
|  }
 | 
| 
 |