Revert of Fix a bug where if a crypto packet is spuriously retransmitted

net/quic/quic_connection.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // The entity that handles framing writes for a Quic client or server.
 // Each QuicSession will have a connection associated with it.
 //
 // On the server side, the Dispatcher handles the raw reads, and hands off
 // packets via ProcessUdpPacket for framing and processing.
 //
@@ skipping 399 matching lines @@
   // remaining unacked packets.
   void OnRetransmissionTimeout();
 
   // Retransmits all unacked packets with retransmittable frames if
   // |retransmission_type| is ALL_PACKETS, otherwise retransmits only initially
   // encrypted packets. Used when the negotiated protocol version is different
   // from what was initially assumed and when the visitor wants to re-transmit
   // initially encrypted packets when the initial encrypter changes.
   void RetransmitUnackedPackets(RetransmissionType retransmission_type);
 
-  // Calls |sent_packet_manager_|'s DiscardUnencryptedPackets. Used when the
+  // Calls |sent_packet_manager_|'s NeuterUnencryptedPackets. Used when the
   // connection becomes forward secure and hasn't received acks for all packets.
-  void DiscardUnencryptedPackets();
+  void NeuterUnencryptedPackets();
 
   // Changes the encrypter used for level |level| to |encrypter|. The function
   // takes ownership of |encrypter|.
   void SetEncrypter(EncryptionLevel level, QuicEncrypter* encrypter);
   const QuicEncrypter* encrypter(EncryptionLevel level) const;
 
   // SetDefaultEncryptionLevel sets the encryption level that will be applied
   // to new packets.
   void SetDefaultEncryptionLevel(EncryptionLevel level);
 
@@ skipping 333 matching lines @@
 
   // Used for connection level flow control.
   scoped_ptr<QuicFlowController> flow_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicConnection);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CONNECTION_H_