Land Recent QUIC Changes.

net/quic/crypto/quic_crypto_server_config.h

Index: net/quic/crypto/quic_crypto_server_config.h
diff --git a/net/quic/crypto/quic_crypto_server_config.h b/net/quic/crypto/quic_crypto_server_config.h
index 3ece064376fcc557ff57a46cbe6968c85e5c8017..e9fe02579d2d0db6c598c6cd193b7b2778aefaa9 100644
--- a/net/quic/crypto/quic_crypto_server_config.h
+++ b/net/quic/crypto/quic_crypto_server_config.h
@@ -43,26 +43,40 @@ class QuicCryptoServerConfigPeer;
 enum HandshakeFailureReason {
   HANDSHAKE_OK = 0,
 
-  // Failure reasons for an invalid client nonce.
+  // Failure reasons for an invalid client nonce in CHLO.
+  //
   // TODO(rtenneti): Implement capturing of error from strike register.
   CLIENT_NONCE_UNKNOWN_FAILURE = 100,
+  // Invalid client nonce. A possible reason, client nonce had incorrect length.
   CLIENT_NONCE_INVALID_FAILURE,
 
-  // Failure reasons for an invalid server nonce.
-  SERVER_NONCE_INVALID_FAILURE = 200,
-  SERVER_NONCE_DECRYPTION_FAILURE,
-  SERVER_NONCE_NOT_UNIQUE_FAILURE,
+  // Failure reasons for an invalid server nonce in CHLO.
+  SERVER_NONCE_INVALID_FAILURE = 200,  // Nonce had incorrect length.
+  SERVER_NONCE_DECRYPTION_FAILURE,     // Unbox of nonce failed.
+  SERVER_NONCE_NOT_UNIQUE_FAILURE,     // Nonce is not unique.
 
-  // Failure reasons for an invalid server config.
+  // Failure reasons for an invalid server config in CHLO.
+  //
+  // Missing Server config id (kSCID) tag.
   SERVER_CONFIG_INCHOATE_HELLO_FAILURE = 300,
+  // GetConfigWithScid couldn't find the Server config id (kSCID).
   SERVER_CONFIG_UNKNOWN_CONFIG_FAILURE,
 
-  // Failure reasons for an invalid source adddress token.
+  // Failure reasons for an invalid source-address token.
+  //
+  // Missing Source-address token (kSourceAddressTokenTag) tag.
   SOURCE_ADDRESS_TOKEN_INVALID_FAILURE = 400,
+  // Unbox of Source-address token failed.
   SOURCE_ADDRESS_TOKEN_DECRYPTION_FAILURE,
+  // Couldn't parse the unbox'ed Source-address token.
   SOURCE_ADDRESS_TOKEN_PARSE_FAILURE,
+  // Source-address token is for a different IP address.
   SOURCE_ADDRESS_TOKEN_DIFFERENT_IP_ADDRESS_FAILURE,
+  // The difference between the time in source-address token and |now| is more
+  // than |source_address_token_future_secs_|.
   SOURCE_ADDRESS_TOKEN_CLOCK_SKEW_FAILURE,
+  // The difference between the time in source-address token and |now| is more
+  // than |source_address_token_lifetime_secs_|.
   SOURCE_ADDRESS_TOKEN_EXPIRED_FAILURE,
 };