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

net/tools/quic/quic_time_wait_list_manager.cc

Index: net/tools/quic/quic_time_wait_list_manager.cc
diff --git a/net/tools/quic/quic_time_wait_list_manager.cc b/net/tools/quic/quic_time_wait_list_manager.cc
index 4fa077f76967c909df32e322608b7263909f0dcf..04ce85b8edc3b8962c20e73c65d812e2b419abf0 100644
--- a/net/tools/quic/quic_time_wait_list_manager.cc
+++ b/net/tools/quic/quic_time_wait_list_manager.cc
@@ -147,9 +147,7 @@ void QuicTimeWaitListManager::OnCanWrite() {
 void QuicTimeWaitListManager::ProcessPacket(
     const QuicSocketAddress& server_address,
     const QuicSocketAddress& client_address,
-    QuicConnectionId connection_id,
-    QuicPacketNumber packet_number,
-    const QuicEncryptedPacket& /*packet*/) {
+    QuicConnectionId connection_id) {
   DCHECK(IsConnectionIdInTimeWait(connection_id));
   QUIC_DLOG(INFO) << "Processing " << connection_id << " in time wait state.";
   // TODO(satyamshekhar): Think about handling packets from different client
@@ -177,7 +175,7 @@ void QuicTimeWaitListManager::ProcessPacket(
     return;
   }
 
-  SendPublicReset(server_address, client_address, connection_id, packet_number);
+  SendPublicReset(server_address, client_address, connection_id);
 }
 
 void QuicTimeWaitListManager::SendVersionNegotiationPacket(
@@ -200,13 +198,11 @@ bool QuicTimeWaitListManager::ShouldSendResponse(int received_packet_count) {
 void QuicTimeWaitListManager::SendPublicReset(
     const QuicSocketAddress& server_address,
     const QuicSocketAddress& client_address,
-    QuicConnectionId connection_id,
-    QuicPacketNumber rejected_packet_number) {
+    QuicConnectionId connection_id) {
   QuicPublicResetPacket packet;
   packet.public_header.connection_id = connection_id;
   packet.public_header.reset_flag = true;
   packet.public_header.version_flag = false;
-  packet.rejected_packet_number = rejected_packet_number;
   // TODO(satyamshekhar): generate a valid nonce for this connection_id.
   packet.nonce_proof = 1010101;
   packet.client_address = client_address;