Revert of Disable SeqNumUnwrapper death tests to avoid breaking downstream builds.

webrtc/modules/video_coding/sequence_number_util_unittest.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 191 matching lines @@
   x = 200;
   for (int i = 0; i < D / 2; ++i) {
     seq_nums_asc.insert(x);
     seq_nums_desc.insert(x);
     ASSERT_EQ(x, *seq_nums_asc.begin());
     ASSERT_EQ(x, *seq_nums_desc.rbegin());
     x = Add<D>(x, 1);
   }
 }
 
-// TODO(philipel): Enable when downstream project can hande these death tests.
-
-TEST(SeqNumUnwrapper, DISABLED_NoBackWardWrap) {
+#if GTEST_HAS_DEATH_TEST
+#if !defined(WEBRTC_ANDROID)
+TEST(SeqNumUnwrapper, NoBackWardWrap) {
   SeqNumUnwrapper<uint8_t> unwrapper;
   EXPECT_EQ(0U, unwrapper.Unwrap(0));
 
   // The unwrapped sequence is not allowed to wrap, if that happens the
   // SeqNumUnwrapper should have been constructed with a higher start value.
-  ASSERT_DEATH_IF_SUPPORTED(unwrapper.Unwrap(255), "");
+  EXPECT_DEATH(unwrapper.Unwrap(255), "");
 }
 
-TEST(SeqNumUnwrapper, DISABLED_NoForwardWrap) {
+TEST(SeqNumUnwrapper, NoForwardWrap) {
   SeqNumUnwrapper<uint32_t> unwrapper(std::numeric_limits<uint64_t>::max());
   EXPECT_EQ(std::numeric_limits<uint64_t>::max(), unwrapper.Unwrap(0));
 
   // The unwrapped sequence is not allowed to wrap, if that happens the
   // SeqNumUnwrapper should have been constructed with a lower start value.
-  ASSERT_DEATH_IF_SUPPORTED(unwrapper.Unwrap(1), "");
+  EXPECT_DEATH(unwrapper.Unwrap(1), "");
 }
+#endif
+#endif
 
 TEST(SeqNumUnwrapper, ForwardWrap) {
   SeqNumUnwrapper<uint8_t> unwrapper;
   EXPECT_EQ(0U, unwrapper.Unwrap(255));
   EXPECT_EQ(1U, unwrapper.Unwrap(0));
 }
 
 TEST(SeqNumUnwrapper, ForwardWrapWithDivisor) {
   SeqNumUnwrapper<uint8_t, 33> unwrapper;
   EXPECT_EQ(0U, unwrapper.Unwrap(30));
@@ skipping 68 matching lines @@
   uint16_t next_unwrap = 0;
   uint64_t expected = kLargeNumber * kNumWraps;
   for (uint16_t i = 0; i < kNumWraps * 2 + 1; ++i) {
     EXPECT_EQ(expected, unwrapper.Unwrap(next_unwrap));
     expected -= kMaxStep;
     next_unwrap = (next_unwrap + kMaxStep + 1) % kLargeNumber;
   }
 }
 
 }  // namespace webrtc