Landing Recent QUIC changes until 9:41 AM, Oct 10, 2016 UTC-7

net/quic/core/crypto/quic_server_info.cc

Index: net/quic/core/crypto/quic_server_info.cc
diff --git a/net/quic/core/crypto/quic_server_info.cc b/net/quic/core/crypto/quic_server_info.cc
index cb3a66fd34c2c31a131455045534eaf185f81add..fa5be4a91e3e31144a61348b87c0cb5cb4ec8e51 100644
--- a/net/quic/core/crypto/quic_server_info.cc
+++ b/net/quic/core/crypto/quic_server_info.cc
@@ -12,9 +12,6 @@ using std::string;
 
 namespace {
 
-// TODO(rtenneti): Delete kQuicCryptoConfigVersionNoChloHash after
-// QUIC_VERSION_31 becomes the default.
-const int kQuicCryptoConfigVersionNoChloHash = 1;
 const int kQuicCryptoConfigVersion = 2;
 
 }  // namespace
@@ -75,10 +72,7 @@ bool QuicServerInfo::ParseInner(const string& data) {
     return false;
   }
 
-  // TODO(rtenneti): Delete kQuicCryptoConfigVersionNoChloHash after
-  // QUIC_VERSION_31 becomes the default.
-  if (!(version == kQuicCryptoConfigVersionNoChloHash ||
-        version == kQuicCryptoConfigVersion)) {
+  if (version != kQuicCryptoConfigVersion) {
     DVLOG(1) << "Unsupported version";
     return false;
   }
@@ -91,20 +85,13 @@ bool QuicServerInfo::ParseInner(const string& data) {
     DVLOG(1) << "Malformed source_address_token";
     return false;
   }
-  // TODO(rtenneti): Delete kQuicCryptoConfigVersionNoChloHash after
-  // QUIC_VERSION_31 becomes the default.
-  if (version == kQuicCryptoConfigVersionNoChloHash) {
-    state->cert_sct.clear();
-    state->chlo_hash.clear();
-  } else {
-    if (!iter.ReadString(&state->cert_sct)) {
-      DVLOG(1) << "Malformed cert_sct";
-      return false;
-    }
-    if (!iter.ReadString(&state->chlo_hash)) {
-      DVLOG(1) << "Malformed chlo_hash";
-      return false;
-    }
+  if (!iter.ReadString(&state->cert_sct)) {
+    DVLOG(1) << "Malformed cert_sct";
+    return false;
+  }
+  if (!iter.ReadString(&state->chlo_hash)) {
+    DVLOG(1) << "Malformed chlo_hash";
+    return false;
   }
   if (!iter.ReadString(&state->server_config_sig)) {
     DVLOG(1) << "Malformed server_config_sig";