Land Recent QUIC Changes.

Introduce QUIC_VERSION_20: allowing endpoints to set different
stream/session flow control windows. Two new tags kSFCW, kCFCW for
stream flow control window and session (connection) flow control windows
respectively. kIFCW is still used for older versions <= QUIC_VERSION_19.
kIFCW has the same value as kCFCW.

Most of this CL is copy/paste code for setting/getting the new tags. New
values are set in quic_client_bin.cc (and quic_stream_factory.cc), and
processed in quic_session.cc and reliable_quic_stream.cc

rtenneti: When merging into Chromium, you should add something like:

config.SetInitialStreamFlowControlWindowToSend(kInitialReceiveWindow);
config.SetInitialSessionFlowControlWindowToSend(kInitialReceiveWindow);

just before *session = new QuicClientSession(...) in quic_stream_factory.cc

Introduce QUIC_VERSION_20: allowing endpoints to set different
stream/session flow control windows.

Merge internal change: 69557631
https://codereview.chromium.org/339803004/


Added SetUserAgentID method to QuicClient which calls crypto_config_'s
set_user_agent_id method.

The following is the internal CL description.

Add command line flags to allow enabling QUIC UDP proxying based on
Chrome version modifers (canary/dev/beta/stable) included in the CHLO
UAID.

Command line flags to allow QUIC UDP proxying for specific Chrome
versions.

Merge internal change: 69473619
https://codereview.chromium.org/346853003/


Refactoring QuicClient so it doesn't own the epoll server it uses.

We'll be using QuicClient to health check backends for UdpProxying, so
it'll need to use the siloed internal server's EpollServer.

Refactoring quic client to not own the epoll server

Merge internal change: 69460313
https://codereview.chromium.org/344053002/


Fix a bug where QUIC ack frames were not bundled with crypto stream
frames when there was a missing packet.

Moved the code to ensure Crypto stream frames weren't sent with other
retransmittable frames from CryptoStreamFrame into QuicPacketGenerator.

Merge internal change: 69415222
https://codereview.chromium.org/342983004/

R=rch@chromium.org

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

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

1 files changed, 5 insertions, 1 deletions

diff --git a/net/quic/quic_end_to_end_unittest.cc b/net/quic/quic_end_to_end_unittest.cc
index e7e2769..89622b0 100644
--- a/net/quic/quic_end_to_end_unittest.cc
+++ b/net/quic/quic_end_to_end_unittest.cc
@@ -136,7 +136,11 @@ class QuicEndToEndTest : public PlatformTest {
     server_address_ = IPEndPoint(ip, 0);
     server_config_.SetDefaults();
     server_config_.SetInitialFlowControlWindowToSend(
-        kInitialFlowControlWindowForTest);
+        kInitialSessionFlowControlWindowForTest);
+    server_config_.SetInitialStreamFlowControlWindowToSend(
+        kInitialStreamFlowControlWindowForTest);
+    server_config_.SetInitialSessionFlowControlWindowToSend(
+        kInitialSessionFlowControlWindowForTest);
     server_thread_.reset(new ServerThread(
          new QuicServer(server_config_, QuicSupportedVersions()),
          server_address_,