Land Recent QUIC Changes.

Cleanup. Saner QuicConnectionTest around entropy hashes; initialize all
fields in QuicAckFrame.

Merge internal change: 58299852
https://codereview.chromium.org/107573005/


QUIC Cleanup to use GetRetransmissionTime() instead of
GetRetransmissionDelay() in SentPacketManager to allow the
SentPacketManager more future control over the retransmission timer.

Merge internal change: 58289241
https://codereview.chromium.org/116953002/


Added GetIncomingReliableStream method to QuicSessionPeer and other
cosmetic changes.

This is part of "Change the ownership model for ...QuicStream and
QuicFasterStatsGatherer" internal change.

Merge internal change: 58281240
https://codereview.chromium.org/114973006/


QuicSentPacketManager cleanup CL to move the handling of acks into one
place.

Merge internal change: 58181919
https://codereview.chromium.org/115933004/

R=rch@chromium.org

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

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

2 files changed, 2 insertions, 9 deletions

diff --git a/net/quic/congestion_control/inter_arrival_sender_test.cc b/net/quic/congestion_control/inter_arrival_sender_test.cc
index fe8dd3c..7d9c39c 100644
--- a/net/quic/congestion_control/inter_arrival_sender_test.cc
+++ b/net/quic/congestion_control/inter_arrival_sender_test.cc
@@ -41,7 +41,7 @@ class InterArrivalSenderTest : public ::testing::Test {
       QuicByteCount bytes_in_packet = kDefaultMaxPacketSize;
       sent_packets_[sequence_number_] =
           new class SendAlgorithmInterface::SentPacket(
-              bytes_in_packet, send_clock_.Now(), HAS_RETRANSMITTABLE_DATA);
+              bytes_in_packet, send_clock_.Now());
 
       sender_.OnPacketSent(send_clock_.Now(), sequence_number_, bytes_in_packet,
                            NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA);
diff --git a/net/quic/congestion_control/send_algorithm_interface.h b/net/quic/congestion_control/send_algorithm_interface.h
index 87a5f9c..44c943f 100644
--- a/net/quic/congestion_control/send_algorithm_interface.h
+++ b/net/quic/congestion_control/send_algorithm_interface.h
@@ -24,19 +24,13 @@ class NET_EXPORT_PRIVATE SendAlgorithmInterface {
  public:
   class SentPacket {
    public:
-    SentPacket(QuicByteCount bytes,
-               QuicTime timestamp,
-               HasRetransmittableData has_retransmittable_data)
+    SentPacket(QuicByteCount bytes, QuicTime timestamp)
         : bytes_sent_(bytes),
           send_timestamp_(timestamp),
-          has_retransmittable_data_(has_retransmittable_data),
           nack_count_(0) {
     }
     QuicByteCount bytes_sent() const { return bytes_sent_; }
     const QuicTime& send_timestamp() const { return send_timestamp_; }
-    HasRetransmittableData has_retransmittable_data() const {
-      return has_retransmittable_data_;
-    }
     size_t nack_count() const { return nack_count_; }
 
     void Nack(size_t min_nacks) {
@@ -46,7 +40,6 @@ class NET_EXPORT_PRIVATE SendAlgorithmInterface {
    private:
     QuicByteCount bytes_sent_;
     QuicTime send_timestamp_;
-    HasRetransmittableData has_retransmittable_data_;
     size_t nack_count_;
   };