Update from https://crrev.com/312398

net/quic/quic_connection_logger.cc

Index: net/quic/quic_connection_logger.cc
diff --git a/net/quic/quic_connection_logger.cc b/net/quic/quic_connection_logger.cc
index 4a1252142e9d168bfa9beac3d1acc43630517481..8b4e8b9ee2421cfcc8bf9e1583673a435e1e4095 100644
--- a/net/quic/quic_connection_logger.cc
+++ b/net/quic/quic_connection_logger.cc
@@ -143,21 +143,6 @@ base::Value* NetLogQuicAckFrameCallback(const QuicAckFrame* frame,
   return dict;
 }
 
-base::Value* NetLogQuicCongestionFeedbackFrameCallback(
-    const QuicCongestionFeedbackFrame* frame,
-    NetLog::LogLevel /* log_level */) {
-  base::DictionaryValue* dict = new base::DictionaryValue();
-  switch (frame->type) {
-    case kTCP:
-      dict->SetString("type", "TCP");
-      dict->SetInteger("receive_window",
-                       static_cast<int>(frame->tcp.receive_window));
-      break;
-  }
-
-  return dict;
-}
-
 base::Value* NetLogQuicRstStreamFrameCallback(
     const QuicRstStreamFrame* frame,
     NetLog::LogLevel /* log_level */) {
@@ -428,12 +413,6 @@ void QuicConnectionLogger::OnFrameAddedToPacket(const QuicFrame& frame) {
       }
       break;
     }
-    case CONGESTION_FEEDBACK_FRAME:
-      net_log_.AddEvent(
-          NetLog::TYPE_QUIC_SESSION_CONGESTION_FEEDBACK_FRAME_SENT,
-          base::Bind(&NetLogQuicCongestionFeedbackFrameCallback,
-                     frame.congestion_feedback_frame));
-      break;
     case RST_STREAM_FRAME:
       UMA_HISTOGRAM_SPARSE_SLOWLY("Net.QuicSession.RstStreamErrorCodeClient",
                                   frame.rst_stream_frame->error_code);
@@ -633,13 +612,6 @@ void QuicConnectionLogger::OnAckFrame(const QuicAckFrame& frame) {
         *missing_packets.rbegin();
 }
 
-void QuicConnectionLogger::OnCongestionFeedbackFrame(
-    const QuicCongestionFeedbackFrame& frame) {
-  net_log_.AddEvent(
-      NetLog::TYPE_QUIC_SESSION_CONGESTION_FEEDBACK_FRAME_RECEIVED,
-      base::Bind(&NetLogQuicCongestionFeedbackFrameCallback, &frame));
-}
-
 void QuicConnectionLogger::OnStopWaitingFrame(
     const QuicStopWaitingFrame& frame) {
   net_log_.AddEvent(