Land Recent QUIC changes.

net/quic/quic_crypto_client_stream.cc

Index: net/quic/quic_crypto_client_stream.cc
diff --git a/net/quic/quic_crypto_client_stream.cc b/net/quic/quic_crypto_client_stream.cc
index 697efe4ce214e6cf176aad6fc123ff5930f54735..674a441e7971a0b62e9c6ee49486139a489cfcbf 100644
--- a/net/quic/quic_crypto_client_stream.cc
+++ b/net/quic/quic_crypto_client_stream.cc
@@ -112,15 +112,9 @@ void QuicCryptoClientStream::DoHandshakeLoop(
         session()->connection()->SetDefaultEncryptionLevel(
             ENCRYPTION_INITIAL);
         if (!encryption_established_) {
-          // TODO(agl): the following, commented code should live here and not
-          // down when the handshake is confirmed. However, it causes
-          // EndToEndTest.LargePost to be flaky (b/8074678), seemingly because
-          // the packets dropped when the client hello is dropped cause the
-          // congestion control to be too conservative and the server times
-          // out.
-          //   encryption_established_ = true;
-          //   session()->OnCryptoHandshakeEvent(
-          //       QuicSession::ENCRYPTION_FIRST_ESTABLISHED);
+          encryption_established_ = true;
+          session()->OnCryptoHandshakeEvent(
+              QuicSession::ENCRYPTION_FIRST_ESTABLISHED);
         } else {
           session()->OnCryptoHandshakeEvent(
               QuicSession::ENCRYPTION_REESTABLISHED);
@@ -226,12 +220,6 @@ void QuicCryptoClientStream::DoHandshakeLoop(
         session()->connection()->SetDefaultEncryptionLevel(
             ENCRYPTION_FORWARD_SECURE);
 
-        // TODO(agl): this code shouldn't be here. See the TODO further up
-        // about it.
-        encryption_established_ = true;
-        session()->OnCryptoHandshakeEvent(
-            QuicSession::ENCRYPTION_FIRST_ESTABLISHED);
-
         handshake_confirmed_ = true;
         session()->OnCryptoHandshakeEvent(QuicSession::HANDSHAKE_CONFIRMED);
         return;