From fb4b2a05fe883801d3b1a977967240a8c8e37a9d Mon Sep 17 00:00:00 2001
From: Renjie Tang <renjietang@chromium.org>
Date: Wed, 17 Feb 2021 01:40:01 +0000
Subject: [PATCH] In QUIC netlog, print string literal for error code in
 STOP_SENDING.

https://source.chromium.org/chromium/chromium/src/+/master:third_party/catapult/netlog_viewer/netlog_viewer/log_view_painter.js;l=411?q=quic_rst_stream_error&ss=chromium%2Fchromium%2Fsrc does the tostring part.

Change-Id: I0d7dd8af1c0d13f655202f732fd512862550f0f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2699008
Auto-Submit: Renjie Tang <renjietang@chromium.org>
Commit-Queue: Renjie Tang <renjietang@chromium.org>
Reviewed-by: David Schinazi <dschinazi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#854573}
---
 net/log/net_log_event_type_list.h | 10 +++++-----
 net/quic/quic_event_logger.cc     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net/log/net_log_event_type_list.h b/net/log/net_log_event_type_list.h
index 92848070bf1516..fc25a3d2f3ac9a 100644
--- a/net/log/net_log_event_type_list.h
+++ b/net/log/net_log_event_type_list.h
@@ -1943,11 +1943,11 @@ EVENT_TYPE(QUIC_SESSION_STOP_WAITING_FRAME_RECEIVED)
 //   }
 EVENT_TYPE(QUIC_SESSION_STOP_WAITING_FRAME_SENT)
 
-// Session recevied a RST_STREAM frame.
+// Session received a RST_STREAM frame.
 //   {
 //     "offset": <Offset in the byte stream which triggered the reset>,
 //     "quic_rst_stream_error": <quic::QuicRstStreamErrorCode in the frame>,
-//     "details": <Human readable description>,
+//     "stream_id": <The stream id which this frame refers to>,
 //   }
 EVENT_TYPE(QUIC_SESSION_RST_STREAM_FRAME_RECEIVED)
 
@@ -1955,7 +1955,7 @@ EVENT_TYPE(QUIC_SESSION_RST_STREAM_FRAME_RECEIVED)
 //   {
 //     "offset": <Offset in the byte stream which triggered the reset>,
 //     "quic_rst_stream_error": <quic::QuicRstStreamErrorCode in the frame>,
-//     "details": <Human readable description>,
+//     "stream_id": <The stream id which this frame refers to>,
 //   }
 EVENT_TYPE(QUIC_SESSION_RST_STREAM_FRAME_SENT)
 
@@ -2109,14 +2109,14 @@ EVENT_TYPE(QUIC_SESSION_CRYPTO_FRAME_RECEIVED)
 // Session sent a STOP_SENDING frame.
 //  {
 //    "stream_id": <The stream id>,
-//    "application_error_code": <The application error code>
+//    "rsr_stream_error_code": <quic::QuicRstStreamErrorCode in the frame>
 //  }
 EVENT_TYPE(QUIC_SESSION_STOP_SENDING_FRAME_SENT)
 
 // Session received a STOP_SENDING frame.
 //  {
 //    "stream_id": <The stream id>,
-//    "application_error_code": <The application error code>
+//    "rsr_stream_error_code": <Tquic::QuicRstStreamErrorCode in the frame>
 //  }
 EVENT_TYPE(QUIC_SESSION_STOP_SENDING_FRAME_RECEIVED)
 
diff --git a/net/quic/quic_event_logger.cc b/net/quic/quic_event_logger.cc
index 7f0154b1681bb3..05e80d60f2c3a0 100644
--- a/net/quic/quic_event_logger.cc
+++ b/net/quic/quic_event_logger.cc
@@ -377,7 +377,7 @@ base::Value NetLogQuicStopSendingFrameParams(
     const quic::QuicStopSendingFrame* frame) {
   base::Value dict(base::Value::Type::DICTIONARY);
   dict.SetIntKey("stream_id", frame->stream_id);
-  dict.SetIntKey("error_code", frame->error_code);
+  dict.SetIntKey("quic_rst_stream_error", frame->error_code);
   return dict;
 }