1 files changed, 36 insertions, 18 deletions

diff --git a/chromium/net/quic/quic_ack_notifier_test.cc b/chromium/net/quic/quic_ack_notifier_test.cc
index 8facee340f0..63bc25405b4 100644
--- a/chromium/net/quic/quic_ack_notifier_test.cc
+++ b/chromium/net/quic/quic_ack_notifier_test.cc
@@ -8,40 +8,44 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using testing::_;
+
 namespace net {
 namespace test {
 namespace {
 
 class QuicAckNotifierTest : public ::testing::Test {
  protected:
+  QuicAckNotifierTest() : zero_(QuicTime::Delta::Zero()) {}
+
   virtual void SetUp() {
-    notifier_.reset(new QuicAckNotifier(&delegate_));
+    delegate_ = new MockAckNotifierDelegate;
+    notifier_.reset(new QuicAckNotifier(delegate_));
 
-    sequence_numbers_.insert(26);
-    sequence_numbers_.insert(99);
-    sequence_numbers_.insert(1234);
-    notifier_->AddSequenceNumbers(sequence_numbers_);
+    notifier_->AddSequenceNumber(26, 100);
+    notifier_->AddSequenceNumber(99, 20);
+    notifier_->AddSequenceNumber(1234, 3);
   }
 
-  SequenceNumberSet sequence_numbers_;
-  MockAckNotifierDelegate delegate_;
+  MockAckNotifierDelegate* delegate_;
   scoped_ptr<QuicAckNotifier> notifier_;
+  QuicTime::Delta zero_;
 };
 
 // Should trigger callback when we receive acks for all the registered seqnums.
 TEST_F(QuicAckNotifierTest, TriggerCallback) {
-  EXPECT_CALL(delegate_, OnAckNotification()).Times(1);
-  EXPECT_FALSE(notifier_->OnAck(26));
-  EXPECT_FALSE(notifier_->OnAck(99));
-  EXPECT_TRUE(notifier_->OnAck(1234));
+  EXPECT_CALL(*delegate_, OnAckNotification(3, 123, 0, 0, zero_)).Times(1);
+  EXPECT_FALSE(notifier_->OnAck(26, zero_));
+  EXPECT_FALSE(notifier_->OnAck(99, zero_));
+  EXPECT_TRUE(notifier_->OnAck(1234, zero_));
 }
 
 // Should not trigger callback if we never provide all the seqnums.
 TEST_F(QuicAckNotifierTest, DoesNotTrigger) {
   // Should not trigger callback as not all packets have been seen.
-  EXPECT_CALL(delegate_, OnAckNotification()).Times(0);
-  EXPECT_FALSE(notifier_->OnAck(26));
-  EXPECT_FALSE(notifier_->OnAck(99));
+  EXPECT_CALL(*delegate_, OnAckNotification(_, _, _, _, _)).Times(0);
+  EXPECT_FALSE(notifier_->OnAck(26, zero_));
+  EXPECT_FALSE(notifier_->OnAck(99, zero_));
 }
 
 // Should trigger even after updating sequence numbers and receiving ACKs for
@@ -51,10 +55,24 @@ TEST_F(QuicAckNotifierTest, UpdateSeqNums) {
   notifier_->UpdateSequenceNumber(99, 3000);
   notifier_->UpdateSequenceNumber(1234, 3001);
 
-  EXPECT_CALL(delegate_, OnAckNotification()).Times(1);
-  EXPECT_FALSE(notifier_->OnAck(26));  // original
-  EXPECT_FALSE(notifier_->OnAck(3000));  // updated
-  EXPECT_TRUE(notifier_->OnAck(3001));  // updated
+  EXPECT_CALL(*delegate_, OnAckNotification(3, 123, 2, 20 + 3, _)).Times(1);
+  EXPECT_FALSE(notifier_->OnAck(26, zero_));    // original
+  EXPECT_FALSE(notifier_->OnAck(3000, zero_));  // updated
+  EXPECT_TRUE(notifier_->OnAck(3001, zero_));   // updated
+}
+
+// Make sure the delegate is called with the delta time from the last ACK.
+TEST_F(QuicAckNotifierTest, DeltaTime) {
+  const QuicTime::Delta first_delta = QuicTime::Delta::FromSeconds(5);
+  const QuicTime::Delta second_delta = QuicTime::Delta::FromSeconds(33);
+  const QuicTime::Delta third_delta = QuicTime::Delta::FromSeconds(10);
+
+  EXPECT_CALL(*delegate_,
+              OnAckNotification(3, 123, 0, 0, third_delta))
+      .Times(1);
+  EXPECT_FALSE(notifier_->OnAck(26, first_delta));
+  EXPECT_FALSE(notifier_->OnAck(99, second_delta));
+  EXPECT_TRUE(notifier_->OnAck(1234, third_delta));
 }
 
 }  // namespace