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: 363277560
Change-Id: I6c65edfb29b4b8798db189a244c9b3ef17067786

quic/core/batch_writer/quic_batch_writer_base.cc

diff --git a/quic/core/batch_writer/quic_batch_writer_base.cc b/quic/core/batch_writer/quic_batch_writer_base.cc
index 4f79980..aacb977 100644
--- a/quic/core/batch_writer/quic_batch_writer_base.cc
+++ b/quic/core/batch_writer/quic_batch_writer_base.cc
@@ -121,7 +121,7 @@
 
     // Since buffered_writes has been emptied, this write must have been
     // buffered successfully.
-    QUIC_BUG_IF_V2(quic_bug_10826_1, !buffered)
+    QUIC_BUG_IF(quic_bug_10826_1, !buffered)
         << "Failed to push to an empty batch buffer."
         << "  self_addr:" << self_address.ToString()
         << ", peer_addr:" << peer_address.ToString() << ", buf_len:" << buf_len;

quic/core/batch_writer/quic_batch_writer_buffer.cc

diff --git a/quic/core/batch_writer/quic_batch_writer_buffer.cc b/quic/core/batch_writer/quic_batch_writer_buffer.cc
index 81f8b0a..8a450d7 100644
--- a/quic/core/batch_writer/quic_batch_writer_buffer.cc
+++ b/quic/core/batch_writer/quic_batch_writer_buffer.cc
@@ -75,7 +75,7 @@
     } else if (IsInternalBuffer(buffer, buf_len)) {
       memmove(next_write_location, buffer, buf_len);
     } else {
-      QUIC_BUG_V2(quic_bug_10831_1)
+      QUIC_BUG(quic_bug_10831_1)
           << "Buffer[" << static_cast<const void*>(buffer) << ", "
           << static_cast<const void*>(buffer + buf_len)
           << ") overlaps with internal buffer["

quic/core/batch_writer/quic_gso_batch_writer.h

diff --git a/quic/core/batch_writer/quic_gso_batch_writer.h b/quic/core/batch_writer/quic_gso_batch_writer.h
index 3e544f6..f87e9f8 100644
--- a/quic/core/batch_writer/quic_gso_batch_writer.h
+++ b/quic/core/batch_writer/quic_gso_batch_writer.h
@@ -100,7 +100,7 @@
 
     batch_buffer().PopBufferedWrite(buffered_writes().size());
 
-    QUIC_BUG_IF_V2(quic_bug_12544_1, !buffered_writes().empty())
+    QUIC_BUG_IF(quic_bug_12544_1, !buffered_writes().empty())
         << "All packets should have been written on a successful return";
     return result;
   }

quic/core/batch_writer/quic_sendmmsg_batch_writer.cc

diff --git a/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc b/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc
index ac68db0..d5c0329 100644
--- a/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc
+++ b/quic/core/batch_writer/quic_sendmmsg_batch_writer.cc
@@ -55,7 +55,7 @@
       QUICHE_DCHECK_EQ(0, num_packets_sent);
       break;
     } else if (num_packets_sent == 0) {
-      QUIC_BUG_V2(quic_bug_10825_1)
+      QUIC_BUG(quic_bug_10825_1)
           << "WriteMultiplePackets returned OK, but no packets were sent.";
       write_result = WriteResult(WRITE_STATUS_ERROR, EIO);
       break;
@@ -75,7 +75,7 @@
     return result;
   }
 
-  QUIC_BUG_IF_V2(quic_bug_12537_1, !buffered_writes().empty())
+  QUIC_BUG_IF(quic_bug_12537_1, !buffered_writes().empty())
       << "All packets should have been written on a successful return";
   write_result.bytes_written = result.bytes_written;
   return result;