Fix tests that break Envoy merge

PiperOrigin-RevId: 448130780

quiche/http2/adapter/nghttp2_session_test.cc

diff --git a/quiche/http2/adapter/nghttp2_session_test.cc b/quiche/http2/adapter/nghttp2_session_test.cc
index 78a3b92..33019d4 100644
--- a/quiche/http2/adapter/nghttp2_session_test.cc
+++ b/quiche/http2/adapter/nghttp2_session_test.cc
@@ -311,9 +311,12 @@
   ASSERT_EQ(0, result);
   EXPECT_TRUE(session.want_write());
   int send_result = -1;
-  EXPECT_QUICHE_BUG(send_result = nghttp2_session_send(session.raw_ptr()),
-                    "Extension frame payload for stream 1 is null!");
-  EXPECT_EQ(NGHTTP2_ERR_CALLBACK_FAILURE, send_result);
+  EXPECT_QUICHE_BUG(
+      {
+        send_result = nghttp2_session_send(session.raw_ptr());
+        EXPECT_EQ(NGHTTP2_ERR_CALLBACK_FAILURE, send_result);
+      },
+      "Extension frame payload for stream 1 is null!");
 }
 
 }  // namespace

quiche/http2/adapter/window_manager_test.cc

diff --git a/quiche/http2/adapter/window_manager_test.cc b/quiche/http2/adapter/window_manager_test.cc
index b8f0e92..9e6260c 100644
--- a/quiche/http2/adapter/window_manager_test.cc
+++ b/quiche/http2/adapter/window_manager_test.cc
@@ -99,8 +99,12 @@
   wm_.MarkDataBuffered(42);
   EXPECT_EQ(peer_.buffered(), 42u);
   // Don't flush more than has been buffered!
-  EXPECT_QUICHE_BUG(wm_.MarkDataFlushed(43), "buffered underflow");
-  EXPECT_EQ(peer_.buffered(), 0u);
+  EXPECT_QUICHE_BUG(
+      {
+        wm_.MarkDataFlushed(43);
+        EXPECT_EQ(peer_.buffered(), 0u);
+      },
+      "buffered underflow");
 }
 
 // This test verifies that WindowManager notifies its listener when window is