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

net/quic/core/crypto/quic_server_info.cc

 // Copyright 2014 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/core/crypto/quic_server_info.h"
 
 #include <limits>
 
 #include "base/pickle.h"
 
 using std::string;
 
 namespace {
 
-// TODO(rtenneti): Delete kQuicCryptoConfigVersionNoChloHash after
-// QUIC_VERSION_31 becomes the default.
-const int kQuicCryptoConfigVersionNoChloHash = 1;
 const int kQuicCryptoConfigVersion = 2;
 
 }  // namespace
 
 namespace net {
 
 QuicServerInfo::State::State() {}
 
 QuicServerInfo::State::~State() {}
 
@@ skipping 40 matching lines @@
 
   base::Pickle p(data.data(), data.size());
   base::PickleIterator iter(p);
 
   int version = -1;
   if (!iter.ReadInt(&version)) {
     DVLOG(1) << "Missing version";
     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;
   }
 
   if (!iter.ReadString(&state->server_config)) {
     DVLOG(1) << "Malformed server_config";
     return false;
   }
   if (!iter.ReadString(&state->source_address_token)) {
     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";
     return false;
   }
 
   // Read certs.
   uint32_t num_certs;
   if (!iter.ReadUInt32(&num_certs)) {
     DVLOG(1) << "Malformed num_certs";
@@ skipping 36 matching lines @@
       return string();
     }
   }
 
   return string(reinterpret_cast<const char*>(p.data()), p.size());
 }
 
 QuicServerInfoFactory::~QuicServerInfoFactory() {}
 
 }  // namespace net