Land Recent QUIC changes.

net/quic/quic_crypto_client_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_crypto_client_stream.h"
 
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/crypto_utils.h"
 #include "net/quic/crypto/null_encrypter.h"
 #include "net/quic/crypto/proof_verifier.h"
@@ skipping 94 matching lines @@
             crypto_negotiated_params_.initial_crypters.decrypter.release(),
             true /* latch once used */);
         // Send subsequent packets under encryption on the assumption that the
         // server will accept the handshake.
         session()->connection()->SetEncrypter(
             ENCRYPTION_INITIAL,
             crypto_negotiated_params_.initial_crypters.encrypter.release());
         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);
         }
         return;
       }
       case STATE_RECV_REJ:
         // We sent a dummy CHLO because we didn't have enough information to
         // perform a handshake, or we sent a full hello that the server
         // rejected. Here we hope to have a REJ that contains the information
@@ skipping 85 matching lines @@
         // has been floated that the server shouldn't send packets encrypted
         // with the FORWARD_SECURE key until it receives a FORWARD_SECURE
         // packet from the client.
         session()->connection()->SetAlternativeDecrypter(
             crypters->decrypter.release(), false /* don't latch */);
         session()->connection()->SetEncrypter(
             ENCRYPTION_FORWARD_SECURE, crypters->encrypter.release());
         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;
       }
       case STATE_IDLE:
         // This means that the peer sent us a message that we weren't expecting.
         CloseConnection(QUIC_INVALID_CRYPTO_MESSAGE_TYPE);
         return;
     }
   }
 }
 
 }  // namespace net