Land Recent QUIC Changes.

Tiny refactor of QuicSentPacketManager::NetworkChangeVisitor's
OnCongestionWindowChange() method to take no arguments, and require the
caller to fetch the updated congestion window.

Slightly simplifies the code. In preparation for the larger
GetCongestionWindowInPackets() cleanup.

Merge internal change: 78883300
https://codereview.chromium.org/694383002/

Change the number of emulated connections in QUIC's congestion control
as the number of open streams changes when the NCON connection option is
supplied.

Merge internal change: 78876869
https://codereview.chromium.org/682293004/

Merge changes to keep chromium source tree same as internal source tree.

Merge internal change: 78853598
https://codereview.chromium.org/693253002/

QUIC: Only send a new SCUP if enough packets have been sent since the
last SCUP.

Merge internal change: 78841268
https://codereview.chromium.org/699433002/

Fixes reduction for n-connection emulation in TCP Reno.

Merge internal change: 78812645
https://codereview.chromium.org/680253005/

Delay a QUIC server's use of the FORWARD_SECURE encrypter until the
client has had a chance to start using it.

Protected by FLAGS_enable_quic_delay_forward_security.

When the forward secure encrypter is available, don't use it until one
of two things happens:
1) the peers starts sending forward secure encrypted packets
2) 2 round trips worth of packets have been sent, in case something
   (MitM?) is preventing the peer from using forward secure encryption.

Merge internal change: 78801773

Set FLAGS_enable_quic_delay_forward_security to true in chromium.

https://codereview.chromium.org/698703003/

Change QUIC's Reno congestion controller to use a higher beta. Fixed
tests to be independent of beta.

Merge internal change: 78728349
https://codereview.chromium.org/698713002/

R=rch@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#302571}

1 files changed, 4 insertions, 1 deletions

diff --git a/net/quic/quic_sent_packet_manager.h b/net/quic/quic_sent_packet_manager.h
index 837bfb5..cccacab 100644
--- a/net/quic/quic_sent_packet_manager.h
+++ b/net/quic/quic_sent_packet_manager.h
@@ -67,7 +67,7 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
     virtual ~NetworkChangeVisitor() {}
 
     // Called when congestion window may have changed.
-    virtual void OnCongestionWindowChange(QuicByteCount congestion_window) = 0;
+    virtual void OnCongestionWindowChange() = 0;
     // TODO(jri): Add OnRttStatsChange() to this class as well.
   };
 
@@ -98,6 +98,8 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
 
   virtual void SetFromConfig(const QuicConfig& config);
 
+  void SetNumOpenStreams(size_t num_streams);
+
   void SetHandshakeConfirmed() { handshake_confirmed_ = true; }
 
   // Processes the incoming ack.
@@ -345,6 +347,7 @@ class NET_EXPORT_PRIVATE QuicSentPacketManager {
   RttStats rtt_stats_;
   scoped_ptr<SendAlgorithmInterface> send_algorithm_;
   scoped_ptr<LossDetectionInterface> loss_algorithm_;
+  bool n_connection_simulation_;
 
   // Receiver side buffer in bytes.
   QuicByteCount receive_buffer_bytes_;