Land Recent QUIC Changes.

Fix a flaky EndToEndTest where packet loss is possible with a large
buffer that may overrun.

Merge internal change: 66821654
https://codereview.chromium.org/280383003/


QUIC change to invoke SetNotPending for retransmissions in
MarkForRetransmission and a minor cleanup in UnackedPacketMap.

Merge internal change: 66729074
https://codereview.chromium.org/278823005/


Remove unused IsHandshake argument to QuicConnection::OnCanWrite.

Merge internal change: 66652078
https://codereview.chromium.org/286563003/


Revert of Fix a bug where if a crypto packet is spuriously retransmitted
and thenneutered, it remains in missing_packets until the end of the
connection.

Reverted chromium cl: https://codereview.chromium.org/270213002/

Rollback of Merge internal change: 66262890.

*** Reason for rollback ***

 This appears to have caused a major QUIC loadtest regression on
 internal server.

Additionally, it's wrong in some other subtle ways, so rolling it back
and trying a new approach.

*** Original change description ***

 Fix a bug where if a crypto packet is spuriously retransmitted and then
 neutered, it remains in missing_packets until the end of the
 connection.

***

Merge internal change: 66615668
https://codereview.chromium.org/287583002/


Revert of Minor QUIC cleanup to combine QuicUnackedPacketMap's
RemovePacket and NeuterPacket into RemoveOrNeuterPacket.

Rollback of merge internal change: 66306887
Rollback of Chromium's CL https://codereview.chromium.org/271443008/

*** Reason for rollback ***

 After further issues with the QUIC handshake packets, rolling back this
 change in favor of a different approach.

*** Original change description ***

 Minor QUIC cleanup to combine QuicUnackedPacketMap's RemovePacket and
 NeuterPacket into RemoveOrNeuterPacket.

 This prevents potential bugs where a packet can be set not pending, then
 neuter'd, which cuases the packet to never be removed from the unacked
 packet map.

***

Merge internal change: 66573334
https://codereview.chromium.org/280753002/


Merging end_to_end_test.cc with the internal source tree.

+ Fixed comments (MB for megabytes and 256KB per sec instead of 1Mbit).
+ Made LargePostWithPacketLossAndBlockedSocket and
  LargePostNoPacketLossWithDelayAndReordering to be in the same
  order as the internal source tree.

Merge internal change: 66556306
https://codereview.chromium.org/283683002/


Allows QUIC connections to remain established even though the peer's
port has changed. Should make things a bit better for clients
experiencing NAT rebindign while talking QUIC to Bandaid.

QUIC connection port migration. Protected behind
FLAGS_quic_allow_port_migration

Merge internal change: 66523001
https://codereview.chromium.org/279453004/


Remove unnecessary methods from QuicUnackedPacketMap and a minor
QuicSentPacketManagerTest fix as a result.

Merge internal change: 66427453
https://codereview.chromium.org/287443003/

R=rch@chromium.org

Review URL: https://codereview.chromium.org/283693002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270046 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 1 deletions

diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h
index 1af85c4..cca7f4c 100644
--- a/net/quic/quic_sent_packet_manager.h
+++ b/net/quic/quic_sent_packet_manager.h
@@ -96,7 +96,7 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
 
   // Removes the retransmittable frames from all unencrypted packets to ensure
   // they don't get retransmitted.
-  void DiscardUnencryptedPackets();
+  void NeuterUnencryptedPackets();
 
   // Returns true if the unacked packet |sequence_number| has retransmittable
   // frames.  This will only return false if the packet has been acked, if a