Land Recent QUIC Changes.

net/quic/quic_protocol.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_protocol.h"
 
 #include "base/stl_util.h"
 #include "net/quic/quic_utils.h"
 
 using base::StringPiece;
@@ skipping 253 matching lines @@
       largest_observed(0),
       delta_time_largest_observed(QuicTime::Delta::Infinite()),
       is_truncated(false) {}
 
 QuicAckFrame::~QuicAckFrame() {}
 
 CongestionFeedbackMessageTCP::CongestionFeedbackMessageTCP()
     : receive_window(0) {
 }
 
-CongestionFeedbackMessageInterArrival::CongestionFeedbackMessageInterArrival() {
+CongestionFeedbackMessageTimestamp::CongestionFeedbackMessageTimestamp() {
 }
 
-CongestionFeedbackMessageInterArrival::
-    ~CongestionFeedbackMessageInterArrival() {}
+CongestionFeedbackMessageTimestamp::~CongestionFeedbackMessageTimestamp() {}
 
 QuicCongestionFeedbackFrame::QuicCongestionFeedbackFrame() : type(kTCP) {}
 
 QuicCongestionFeedbackFrame::~QuicCongestionFeedbackFrame() {}
 
 QuicRstStreamErrorCode AdjustErrorForVersion(
     QuicRstStreamErrorCode error_code,
     QuicVersion version) {
   switch (error_code) {
     case QUIC_RST_FLOW_CONTROL_ACCOUNTING:
@@ skipping 206 matching lines @@
      << "data { "
      << QuicUtils::StringToHexASCIIDump(*(stream_frame.GetDataAsString()))
      << " }\n";
   return os;
 }
 
 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 << "]";
       break;
     }
     case kTCP: {
       const CongestionFeedbackMessageTCP& tcp = congestion_frame.tcp;
       os << " receive_window: " << tcp.receive_window;
       break;
     }
@@ skipping 240 matching lines @@
       sent_time(QuicTime::Zero()),
       bytes_sent(0),
       nack_count(0),
       transmission_type(transmission_type),
       all_transmissions(all_transmissions),
       in_flight(false) {
   all_transmissions->insert(sequence_number);
 }
 
 }  // namespace net