Landing Recent QUIC changes until 3:35 PM, Apr 26, 2017 UTC-4

net/tools/quic/quic_time_wait_list_manager.h

Index: net/tools/quic/quic_time_wait_list_manager.h
diff --git a/net/tools/quic/quic_time_wait_list_manager.h b/net/tools/quic/quic_time_wait_list_manager.h
index 6e611796904ce9c599247d6bfd12a6b8f4e60f64..f2eb50597cf9d59a7b42a587982254f011de6301 100644
--- a/net/tools/quic/quic_time_wait_list_manager.h
+++ b/net/tools/quic/quic_time_wait_list_manager.h
@@ -85,9 +85,7 @@ class QuicTimeWaitListManager : public QuicBlockedWriterInterface {
   // state. virtual to override in tests.
   virtual void ProcessPacket(const QuicSocketAddress& server_address,
                              const QuicSocketAddress& client_address,
-                             QuicConnectionId connection_id,
-                             QuicPacketNumber packet_number,
-                             const QuicEncryptedPacket& packet);
+                             QuicConnectionId connection_id);
 
   // Called by the dispatcher when the underlying socket becomes writable again,
   // since we might need to send pending public reset packets which we didn't
@@ -124,8 +122,7 @@ class QuicTimeWaitListManager : public QuicBlockedWriterInterface {
   // Creates a public reset packet and sends it or queues it to be sent later.
   virtual void SendPublicReset(const QuicSocketAddress& server_address,
                                const QuicSocketAddress& client_address,
-                               QuicConnectionId connection_id,
-                               QuicPacketNumber rejected_packet_number);
+                               QuicConnectionId connection_id);
 
  private:
   friend class test::QuicDispatcherPeer;