Land Recent QUIC Changes.

Refactor hybrid slow start in QUIC to create a simpler interface between
it an TCPCubicSender.

In preparation for BBR.
Merge internal change: 64031462
https://codereview.chromium.org/218993002/


Don't log decryption errors in AeadBaseDecrypter::Decrypt.

Instead, have QuicFramer::DecryptPayload log a warning message if both
trial decryptions fail.

Merge internal change: 63977728
https://codereview.chromium.org/218983002/


QUIC refactor to remove a return value which was always true.

Merge internal change: 63977684
https://codereview.chromium.org/218913003/


Simplify the bytes_consumed computation
in QuicPacketCreator::CreateStreamFrame. Does not change behavior.

Merge internal change: 63900899
https://codereview.chromium.org/218873003/


Fixing a broken test for quic.  cr/63542972 added the proxy flag on
outbound packets.  Unfortunately, this broke our tests using the magic
header. This CL provides hooks for clearing that bit of data.

Adding a virtual function to quic client so we can fix a test.

Merge internal change: 63898585
https://codereview.chromium.org/218963003/


+ Use QuicServerKey tuple (host, port, is_https) instead of
  server_hostname, while creating QuicClientSession,
  QuicCryptoClientStream, QuicCryptoClientConfig, QuicClient,
  QuicTestClient, etc objects.

+ QuicServerKey is used as the key to access QUIC server
  config information from all caches.

+ Added couple of new unit tests for HostPortPair class.

+ Added unit tests for QuicServerId for privacy mode
  combination with host, port, is_https.

Merge internal change: 63891842
https://codereview.chromium.org/218923002/

R=rch@chromium.org

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

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

1 files changed, 2 insertions, 2 deletions

diff --git a/net/quic/quic_client_session.h b/net/quic/quic_client_session.h
index 801ad07..9ad12ed 100644
--- a/net/quic/quic_client_session.h
+++ b/net/quic/quic_client_session.h
@@ -30,7 +30,7 @@ class DatagramClientSocket;
 class QuicConnectionHelper;
 class QuicCryptoClientStreamFactory;
 class QuicDefaultPacketWriter;
-class QuicSessionKey;
+class QuicServerId;
 class QuicServerInfo;
 class QuicStreamFactory;
 class SSLInfo;
@@ -95,7 +95,7 @@ class NET_EXPORT_PRIVATE QuicClientSession : public QuicClientSessionBase {
                     QuicStreamFactory* stream_factory,
                     QuicCryptoClientStreamFactory* crypto_client_stream_factory,
                     scoped_ptr<QuicServerInfo> server_info,
-                    const QuicSessionKey& server_key,
+                    const QuicServerId& server_id,
                     const QuicConfig& config,
                     QuicCryptoClientConfig* crypto_config,
                     NetLog* net_log);