Land Recent QUIC Changes.

net/quic/quic_protocol.cc

Index: net/quic/quic_protocol.cc
diff --git a/net/quic/quic_protocol.cc b/net/quic/quic_protocol.cc
index a1975022bb09dda6d2bfeeadd851d35c844a2b19..c587c56f8dd22da51ce47fa3a758f9590dc6c100 100644
--- a/net/quic/quic_protocol.cc
+++ b/net/quic/quic_protocol.cc
@@ -271,11 +271,10 @@ CongestionFeedbackMessageTCP::CongestionFeedbackMessageTCP()
     : receive_window(0) {
 }
 
-CongestionFeedbackMessageInterArrival::CongestionFeedbackMessageInterArrival() {
+CongestionFeedbackMessageTimestamp::CongestionFeedbackMessageTimestamp() {
 }
 
-CongestionFeedbackMessageInterArrival::
-    ~CongestionFeedbackMessageInterArrival() {}
+CongestionFeedbackMessageTimestamp::~CongestionFeedbackMessageTimestamp() {}
 
 QuicCongestionFeedbackFrame::QuicCongestionFeedbackFrame() : type(kTCP) {}
 
@@ -502,13 +501,12 @@ ostream& operator<<(ostream& os,
                     const QuicCongestionFeedbackFrame& congestion_frame) {
   os << "type: " << congestion_frame.type;
   switch (congestion_frame.type) {
-    case kInterArrival: {
-      const CongestionFeedbackMessageInterArrival& inter_arrival =
-          congestion_frame.inter_arrival;
+    case kTimestamp: {
+      const CongestionFeedbackMessageTimestamp& timestamp =
+          congestion_frame.timestamp;
       os << " received packets: [ ";
-      for (TimeMap::const_iterator it =
-               inter_arrival.received_packet_times.begin();
-           it != inter_arrival.received_packet_times.end(); ++it) {
+      for (TimeMap::const_iterator it = timestamp.received_packet_times.begin();
+           it != timestamp.received_packet_times.end(); ++it) {
         os << it->first << "@" << it->second.ToDebuggingValue() << " ";
       }
       os << "]";