Upstream version 7.35.144.0

[platform/framework/web/crosswalk.git] / src / net / quic / congestion_control / inter_arrival_sender_test.cc

diff --git a/src/net/quic/congestion_control/inter_arrival_sender_test.cc b/src/net/quic/congestion_control/inter_arrival_sender_test.cc
index 61655dd..048cbb0 100644 (file)
--- a/src/net/quic/congestion_control/inter_arrival_sender_test.cc
+++ b/src/net/quic/congestion_control/inter_arrival_sender_test.cc
@@ -5,8 +5,8 @@
 #include "net/quic/congestion_control/inter_arrival_sender.h"
 
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
+#include "net/quic/congestion_control/rtt_stats.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -22,26 +22,22 @@ class InterArrivalSenderTest : public ::testing::Test {
        one_s_(QuicTime::Delta::FromMilliseconds(1000)),
        nine_ms_(QuicTime::Delta::FromMilliseconds(9)),
        send_start_time_(send_clock_.Now()),
-       sender_(&send_clock_),
+       sender_(&send_clock_, &rtt_stats_),
        sequence_number_(1),
        acked_sequence_number_(1),
        feedback_sequence_number_(1) {
     send_clock_.AdvanceTime(one_ms_);
     receive_clock_.AdvanceTime(one_ms_);
+    rtt_stats_.set_initial_rtt_us(60 * base::Time::kMicrosecondsPerMillisecond);
   }
 
   virtual ~InterArrivalSenderTest() {
-    STLDeleteValues(&sent_packets_);
   }
 
   void SendAvailableCongestionWindow() {
     while (sender_.TimeUntilSend(send_clock_.Now(),
         NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA, NOT_HANDSHAKE).IsZero()) {
       QuicByteCount bytes_in_packet = kDefaultMaxPacketSize;
-      sent_packets_[sequence_number_] =
-          new class SendAlgorithmInterface::SentPacket(
-              bytes_in_packet, send_clock_.Now());
-
       sender_.OnPacketSent(send_clock_.Now(), sequence_number_, bytes_in_packet,
                            NOT_RETRANSMISSION, HAS_RETRANSMITTABLE_DATA);
       sequence_number_++;
@@ -60,7 +56,6 @@ class InterArrivalSenderTest : public ::testing::Test {
   void SendDelaySpikeFeedbackMessage(QuicTime::Delta spike_time) {
     QuicCongestionFeedbackFrame feedback;
     feedback.type = kInterArrival;
-    feedback.inter_arrival.accumulated_number_of_lost_packets = 0;
     receive_clock_.AdvanceTime(spike_time);
     QuicTime receive_time = receive_clock_.ApproximateNow();
     feedback.inter_arrival.received_packet_times.insert(
@@ -75,8 +70,7 @@ class InterArrivalSenderTest : public ::testing::Test {
             feedback_sequence_number_, receive_time));
     feedback_sequence_number_++;
 
-    sender_.OnIncomingQuicCongestionFeedbackFrame(feedback, send_clock_.Now(),
-                                                  sent_packets_);
+    sender_.OnIncomingQuicCongestionFeedbackFrame(feedback, send_clock_.Now());
   }
 
   void SendFeedbackMessageNPackets(int n,
@@ -84,7 +78,6 @@ class InterArrivalSenderTest : public ::testing::Test {
                                    QuicTime::Delta delta_even) {
     QuicCongestionFeedbackFrame feedback;
     feedback.type = kInterArrival;
-    feedback.inter_arrival.accumulated_number_of_lost_packets = 0;
     for (int i = 0; i < n; ++i) {
       if (feedback_sequence_number_ % 2) {
         receive_clock_.AdvanceTime(delta_even);
@@ -97,8 +90,7 @@ class InterArrivalSenderTest : public ::testing::Test {
               feedback_sequence_number_, receive_time));
       feedback_sequence_number_++;
     }
-    sender_.OnIncomingQuicCongestionFeedbackFrame(feedback, send_clock_.Now(),
-                                                  sent_packets_);
+    sender_.OnIncomingQuicCongestionFeedbackFrame(feedback, send_clock_.Now());
   }
 
   QuicTime::Delta SenderDeltaSinceStart() {
@@ -111,11 +103,11 @@ class InterArrivalSenderTest : public ::testing::Test {
   MockClock send_clock_;
   MockClock receive_clock_;
   const QuicTime send_start_time_;
+  RttStats rtt_stats_;
   InterArrivalSender sender_;
   QuicPacketSequenceNumber sequence_number_;
   QuicPacketSequenceNumber acked_sequence_number_;
   QuicPacketSequenceNumber feedback_sequence_number_;
-  SendAlgorithmInterface::SentPacketsMap sent_packets_;
 };
 
 TEST_F(InterArrivalSenderTest, ProbeFollowedByFullRampUpCycle) {