Use base::Value instead of base::DictionaryValue for QUIC NetLog.

Change-Id: I107fe923f70f641a08fe13326aaea55c8da1a0a0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1823760Reviewed-by: Eric Roman <eroman@chromium.org>
Commit-Queue: Renjie Tang <renjietang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700011}

net/quic/quic_http3_logger.cc

@@ -17,31 +17,13 @@ namespace net {
 
 namespace {
 
-base::Value NetLogPeerControlStreamParams(quic::QuicStreamId id) {
-  base::DictionaryValue dict;
-  dict.SetInteger("stream_id", id);
-  return std::move(dict);
-}
-
-base::Value NetLogPeerQpackEncoderStreamParams(quic::QuicStreamId id) {
-  base::DictionaryValue dict;
-  dict.SetInteger("stream_id", id);
-  return std::move(dict);
-}
-
-base::Value NetLogPeerQpackDecoderStreamParams(quic::QuicStreamId id) {
-  base::DictionaryValue dict;
-  dict.SetInteger("stream_id", id);
-  return std::move(dict);
-}
-
 base::Value NetLogSettingsParams(const quic::SettingsFrame& frame) {
-  base::DictionaryValue dict;
+  base::Value dict(base::Value::Type::DICTIONARY);
   // TODO(renjietang): Use string literal for setting identifiers.
   for (auto setting : frame.values) {
-    dict.SetInteger(base::NumberToString(setting.first), setting.second);
+    dict.SetIntKey(base::NumberToString(setting.first), setting.second);
   }
-  return std::move(dict);
+  return dict;
 }
 
 }  // namespace
@@ -54,26 +36,27 @@ QuicHttp3Logger::~QuicHttp3Logger() {}
 void QuicHttp3Logger::OnPeerControlStreamCreated(quic::QuicStreamId stream_id) {
   if (!net_log_.IsCapturing())
     return;
-  net_log_.AddEvent(NetLogEventType::HTTP3_PEER_CONTROL_STREAM_CREATED,
-                    [&] { return NetLogPeerControlStreamParams(stream_id); });
+  net_log_.AddEventWithIntParams(
+      NetLogEventType::HTTP3_PEER_CONTROL_STREAM_CREATED, "stream_id",
+      stream_id);
 }
 
 void QuicHttp3Logger::OnPeerQpackEncoderStreamCreated(
     quic::QuicStreamId stream_id) {
   if (!net_log_.IsCapturing())
     return;
-  net_log_.AddEvent(
-      NetLogEventType::HTTP3_PEER_QPACK_ENCODER_STREAM_CREATED,
-      [&] { return NetLogPeerQpackEncoderStreamParams(stream_id); });
+  net_log_.AddEventWithIntParams(
+      NetLogEventType::HTTP3_PEER_QPACK_ENCODER_STREAM_CREATED, "stream_id",
+      stream_id);
 }
 
 void QuicHttp3Logger::OnPeerQpackDecoderStreamCreated(
     quic::QuicStreamId stream_id) {
   if (!net_log_.IsCapturing())
     return;
-  net_log_.AddEvent(
-      NetLogEventType::HTTP3_PEER_QPACK_DECODER_STREAM_CREATED,
-      [&] { return NetLogPeerQpackDecoderStreamParams(stream_id); });
+  net_log_.AddEventWithIntParams(
+      NetLogEventType::HTTP3_PEER_QPACK_DECODER_STREAM_CREATED, "stream_id",
+      stream_id);
 }
 
 void QuicHttp3Logger::OnSettingsFrame(const quic::SettingsFrame& frame) {

net/quic/quic_http3_logger.h

@@ -21,7 +21,7 @@ namespace net {
 // to |net_log|.
 class NET_EXPORT_PRIVATE QuicHttp3Logger : public quic::Http3DebugVisitor {
  public:
-  QuicHttp3Logger(const NetLogWithSource& net_log);
+  explicit QuicHttp3Logger(const NetLogWithSource& net_log);
 
   ~QuicHttp3Logger() override;