Land Recent QUIC Changes.

Add case for PING frame in QuicFrame <<.

Merge internal change: 71908470
https://codereview.chromium.org/421963006/


Add methods to the QuicConnectionDebug visitor for tracking various
events which cause a QuicConnection to discard a packet.

Merge internal change: 71871881
https://codereview.chromium.org/421913015/


Change ReliableQuicStream::OnStreamFrame to return void since the method
already closes the connection when there are errors and callers are not
checking the return value

Make QuicStreamSequencer::OnStreamFrame return void instead of bool
since it is already closing the connect or resetting the stream when
there is an error.

Make two QUIC methods return void instead of bool.

Merge internal change: 71870242
https://codereview.chromium.org/420393004/


Create a visitor which can allow using both a trace... visitor and the
existing stats visitor.

Changed QuicConnection's QuicConnectionDebugVisitor to a scoped_ptr.

Merge internal change: 71863508
https://codereview.chromium.org/429453003/


Use 1350 byte QUIC packets by default.

Merge internal change: 71837432
https://codereview.chromium.org/427673005/


Improve debug logging of QUIC crypto handshake.

Merge internal change: 71833151
https://codereview.chromium.org/428803002/


Fix a bug in QuicUnackedPacketMap where an in flight packet could be
removed before being removed from bytes_in_flight.

Merge internal change: 71783653
https://codereview.chromium.org/422123005/


Inline the members of QUIC's ReceivedPacketInfo into QuicAckFrame now
that version 15 is gone.

Merge internal change: 71763611
https://codereview.chromium.org/424003002/


Remove FixRate congestion frame type.

Merge internal change: 71746617
https://codereview.chromium.org/424903002/


Remove QUIC_VERSION_15 now that Chrome Stable supports QUIC_VERSION_16.

Merge internal change: 71718286
https://codereview.chromium.org/413403008/

R=rch@chromium.org
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/420313005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287168 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h
index 4ebe151..1bedf5a 100644
--- a/net/quic/quic_sent_packet_manager.h
+++ b/net/quic/quic_sent_packet_manager.h
@@ -65,7 +65,7 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
         QuicTime time) {}
 
     virtual void OnIncomingAck(
-        const ReceivedPacketInfo& received_info,
+        const QuicAckFrame& ack_frame,
         QuicTime ack_receive_time,
         QuicPacketSequenceNumber largest_observed,
         bool largest_observed_acked,
@@ -122,7 +122,7 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
                              QuicPacketSequenceNumber new_sequence_number);
 
   // Processes the incoming ack.
-  void OnIncomingAck(const ReceivedPacketInfo& received_info,
+  void OnIncomingAck(const QuicAckFrame& ack_frame,
                      QuicTime ack_receive_time);
 
   // Returns true if the non-FEC packet |sequence_number| is unacked.
@@ -250,7 +250,7 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
                           TransmissionType> PendingRetransmissionMap;
 
   // Process the incoming ack looking for newly ack'd data packets.
-  void HandleAckForSentPackets(const ReceivedPacketInfo& received_info);
+  void HandleAckForSentPackets(const QuicAckFrame& ack_frame);
 
   // Returns the current retransmission mode.
   RetransmissionTimeoutMode GetRetransmissionMode() const;
@@ -272,7 +272,7 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
 
   // Update the RTT if the ack is for the largest acked sequence number.
   // Returns true if the rtt was updated.
-  bool MaybeUpdateRTT(const ReceivedPacketInfo& received_info,
+  bool MaybeUpdateRTT(const QuicAckFrame& ack_frame,
                       const QuicTime& ack_receive_time);
 
   // Invokes the loss detection algorithm and loses and retransmits packets if