Migration from GFE_BUG_V2 (and friends) to GFE_BUG

Per go/gfe-bug-improvements GFE_BUGs are getting stable IDs to allow for monitoring and alerting. To achieve that, a temporary set of V2 macros was added and the codebase was migrated to using the V2 macros. Now that migration is complete, the old-style (sans _V2) macros were changed to also take bug_id parameter, which makes the V2 set obsolete. To complete the transition, the codebase is being migrated back to GFE_BUG macros. Once done, V2 macros will be removed.

PiperOrigin-RevId: 363274879
Change-Id: Ifb6e76bb12320427c4dadf7bbed0e4eeb14ab9e0

quic/core/http/quic_spdy_stream.cc

diff --git a/quic/core/http/quic_spdy_stream.cc b/quic/core/http/quic_spdy_stream.cc
index db3b98e..3752880 100644
--- a/quic/core/http/quic_spdy_stream.cc
+++ b/quic/core/http/quic_spdy_stream.cc
@@ -339,7 +339,7 @@
     SpdyHeaderBlock trailer_block,
     QuicReferenceCountedPointer<QuicAckListenerInterface> ack_listener) {
   if (fin_sent()) {
-    QUIC_BUG_V2(quic_bug_10410_1)
+    QUIC_BUG(quic_bug_10410_1)
         << "Trailers cannot be sent after a FIN, on stream " << id();
     return 0;
   }

quic/core/http/quic_spdy_stream_body_manager.cc

diff --git a/quic/core/http/quic_spdy_stream_body_manager.cc b/quic/core/http/quic_spdy_stream_body_manager.cc
index ef219e2..2ae24d4 100644
--- a/quic/core/http/quic_spdy_stream_body_manager.cc
+++ b/quic/core/http/quic_spdy_stream_body_manager.cc
@@ -41,7 +41,7 @@
 
   while (remaining_bytes > 0) {
     if (fragments_.empty()) {
-      QUIC_BUG_V2(quic_bug_10394_1) << "Not enough available body to consume.";
+      QUIC_BUG(quic_bug_10394_1) << "Not enough available body to consume.";
       return 0;
     }