Revert of Landing Recent QUIC Changes.

net/quic/quic_ack_notifier_test.cc

Index: net/quic/quic_ack_notifier_test.cc
diff --git a/net/quic/quic_ack_notifier_test.cc b/net/quic/quic_ack_notifier_test.cc
index 7e9d65250e5d1fccf1adb7a819e42a44a293f30d..21c876665857ed3de03429c3aa672e654af3b23e 100644
--- a/net/quic/quic_ack_notifier_test.cc
+++ b/net/quic/quic_ack_notifier_test.cc
@@ -22,9 +22,9 @@
     delegate_ = new MockAckNotifierDelegate;
     notifier_.reset(new QuicAckNotifier(delegate_));
 
-    notifier_->OnSerializedPacket();
-    notifier_->OnSerializedPacket();
-    notifier_->OnSerializedPacket();
+    notifier_->AddSequenceNumber(26, 100);
+    notifier_->AddSequenceNumber(99, 20);
+    notifier_->AddSequenceNumber(1234, 3);
   }
 
   MockAckNotifierDelegate* delegate_;
@@ -35,26 +35,17 @@
 // Should trigger callback when we receive acks for all the registered seqnums.
 TEST_F(QuicAckNotifierTest, TriggerCallback) {
   EXPECT_CALL(*delegate_, OnAckNotification(0, 0, zero_)).Times(1);
-  EXPECT_FALSE(notifier_->OnAck(zero_));
-  EXPECT_FALSE(notifier_->OnAck(zero_));
-  EXPECT_TRUE(notifier_->OnAck(zero_));
+  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(zero_));
-  EXPECT_FALSE(notifier_->OnAck(zero_));
-}
-
-// Should not trigger callback if we abandon all three packets.
-TEST_F(QuicAckNotifierTest, AbandonDoesNotTrigger) {
-  // Should not trigger callback as not all packets have been seen.
-  EXPECT_CALL(*delegate_, OnAckNotification(_, _, _)).Times(0);
-  EXPECT_FALSE(notifier_->OnPacketAbandoned());
-  EXPECT_FALSE(notifier_->OnPacketAbandoned());
-  EXPECT_TRUE(notifier_->OnPacketAbandoned());
+  EXPECT_FALSE(notifier_->OnAck(26, zero_));
+  EXPECT_FALSE(notifier_->OnAck(99, zero_));
 }
 
 // Should trigger even after updating sequence numbers and receiving ACKs for
@@ -65,9 +56,9 @@
   notifier_->OnPacketRetransmitted(3);
 
   EXPECT_CALL(*delegate_, OnAckNotification(2, 20 + 3, _)).Times(1);
-  EXPECT_FALSE(notifier_->OnAck(zero_));  // original
-  EXPECT_FALSE(notifier_->OnAck(zero_));  // updated
-  EXPECT_TRUE(notifier_->OnAck(zero_));   // updated
+  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.
@@ -77,9 +68,9 @@
   const QuicTime::Delta third_delta = QuicTime::Delta::FromSeconds(10);
 
   EXPECT_CALL(*delegate_, OnAckNotification(0, 0, third_delta)).Times(1);
-  EXPECT_FALSE(notifier_->OnAck(first_delta));
-  EXPECT_FALSE(notifier_->OnAck(second_delta));
-  EXPECT_TRUE(notifier_->OnAck(third_delta));
+  EXPECT_FALSE(notifier_->OnAck(26, first_delta));
+  EXPECT_FALSE(notifier_->OnAck(99, second_delta));
+  EXPECT_TRUE(notifier_->OnAck(1234, third_delta));
 }
 
 }  // namespace