Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/quic/chromium/quic_connection_logger.cc

Index: net/quic/chromium/quic_connection_logger.cc
diff --git a/net/quic/chromium/quic_connection_logger.cc b/net/quic/chromium/quic_connection_logger.cc
index b687de1929c0d93b97b50a60d8599cc086b6b367..d1a733875db54327c0c86f699f96451c40846192 100644
--- a/net/quic/chromium/quic_connection_logger.cc
+++ b/net/quic/chromium/quic_connection_logger.cc
@@ -113,22 +113,10 @@ std::unique_ptr<base::Value> NetLogQuicAckFrameCallback(
                   base::Uint64ToString(frame->largest_observed));
   dict->SetString("delta_time_largest_observed_us",
                   base::Int64ToString(frame->ack_delay_time.ToMicroseconds()));
-  if (frame->missing) {
-    // Entropy and Truncated are not present in v34 and above.
-    dict->SetInteger("entropy_hash", frame->entropy_hash);
-    dict->SetBoolean("truncated", frame->is_truncated);
-  }
 
   base::ListValue* missing = new base::ListValue();
   dict->Set("missing_packets", missing);
-  if (frame->missing) {
-    for (const Interval<QuicPacketNumber>& interval : frame->packets) {
-      for (QuicPacketNumber packet = interval.min(); packet < interval.max();
-           ++packet) {
-        missing->AppendString(base::Uint64ToString(packet));
-      }
-    }
-  } else if (!frame->packets.Empty()) {
+  if (!frame->packets.Empty()) {
     // V34 and above express acked packets, but only print
     // missing packets, because it's typically a shorter list.
     for (QuicPacketNumber packet = frame->packets.Min();
@@ -269,11 +257,6 @@ std::unique_ptr<base::Value> NetLogQuicCertificateVerifiedCallback(
   return std::move(dict);
 }
 
-void UpdatePacketGapSentHistogram(size_t num_consecutive_missing_packets) {
-  UMA_HISTOGRAM_COUNTS("Net.QuicSession.PacketGapSent",
-                       num_consecutive_missing_packets);
-}
-
 void UpdatePublicResetAddressMismatchHistogram(
     const IPEndPoint& server_hello_address,
     const IPEndPoint& public_reset_address) {
@@ -308,7 +291,6 @@ QuicConnectionLogger::QuicConnectionLogger(
       no_packet_received_after_ping_(false),
       previous_received_packet_size_(0),
       largest_received_packet_number_(0),
-      largest_received_missing_packet_number_(0),
       num_out_of_order_received_packets_(0),
       num_out_of_order_large_received_packets_(0),
       num_packets_received_(0),
@@ -550,42 +532,6 @@ void QuicConnectionLogger::OnAckFrame(const QuicAckFrame& frame) {
     return;
 
   // TODO(rch, rtenneti) sort out histograms for QUIC_VERSION_34 and above.
-  if (session_->connection()->version() > QUIC_VERSION_33) {
-    return;
-  }
-  const PacketNumberQueue& missing_packets = frame.packets;
-  PacketNumberQueue::const_iterator it =
-      missing_packets.lower_bound(largest_received_missing_packet_number_);
-  if (it == missing_packets.end() ||
-      largest_received_missing_packet_number_ == missing_packets.Max()) {
-    return;
-  }
-
-  // Scan through the list and log consecutive ranges of missing packets.
-  size_t num_consecutive_missing_packets = 1;
-  QuicPacketNumber previous_missing_packet =
-      largest_received_missing_packet_number_;
-  for (; it != missing_packets.end(); ++it) {
-    // Account for case where first interval starts below
-    // largest_received_missing_packet_number_.
-    QuicPacketNumber interval_min =
-        std::max(previous_missing_packet + 1, it->min());
-    DCHECK_LE(interval_min, it->max());
-
-    size_t interval_len = it->max() - interval_min;
-    if (interval_len == 0) {
-      continue;
-    }
-    if (interval_min == previous_missing_packet + 1) {
-      num_consecutive_missing_packets += interval_len;
-    } else {
-      UpdatePacketGapSentHistogram(num_consecutive_missing_packets);
-      num_consecutive_missing_packets = interval_len;
-    }
-    previous_missing_packet = it->max() - 1;
-  }
-  UpdatePacketGapSentHistogram(num_consecutive_missing_packets);
-  largest_received_missing_packet_number_ = missing_packets.Max();
 }
 
 void QuicConnectionLogger::OnStopWaitingFrame(