commit b87ddb1f630038b42918e227745470f394b03741
author rch <rch@google.com> Thu Nov 14 12:26:05 2019 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Nov 14 12:26:52 2019 -0800
tree 518fdc7b19ecf21c2f506401bc13252526475894
parent cd86dd1236b7f7f74253f0bd26ea6a97fe866a9f

Add a platform macro EXPECT_QUIC_DEBUG_DEATH to ensure that
EXPECT_DEBUG_DEATH is only called when wrapped in the correct
guards in Chromium.

gfe-relnote: n/a - test only
PiperOrigin-RevId: 280485768
Change-Id: Ia59de5357549040da8feed70433dcadc8e648796

quic/core/quic_stream_send_buffer_test.cc

diff --git a/quic/core/quic_stream_send_buffer_test.cc b/quic/core/quic_stream_send_buffer_test.cc
index 477566a..4a37c1e 100644
--- a/quic/core/quic_stream_send_buffer_test.cc
+++ b/quic/core/quic_stream_send_buffer_test.cc
@@ -137,10 +137,8 @@
   // Write new data.
   if (!GetQuicRestartFlag(quic_coalesce_stream_frames_2)) {
     EXPECT_EQ(1, QuicStreamSendBufferPeer::write_index(&send_buffer_));
-#if GTEST_HAS_DEATH_TEST && !defined(NDEBUG)
-    EXPECT_DEBUG_DEATH(send_buffer_.WriteStreamData(2048, 50, &writer),
-                       "Tried to write data out of sequence.");
-#endif
+    EXPECT_QUIC_DEBUG_DEATH(send_buffer_.WriteStreamData(2048, 50, &writer),
+                            "Tried to write data out of sequence.");
   } else {
     EXPECT_EQ(2, QuicStreamSendBufferPeer::write_index(&send_buffer_));
     ASSERT_TRUE(send_buffer_.WriteStreamData(2048, 50, &writer));