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

net/quic/chromium/crypto/proof_verifier_chromium.cc

Index: net/quic/chromium/crypto/proof_verifier_chromium.cc
diff --git a/net/quic/chromium/crypto/proof_verifier_chromium.cc b/net/quic/chromium/crypto/proof_verifier_chromium.cc
index e0a61ec0bdc2cb499200a3c324731fdf9c997a08..baa5e8eab75f8e64182fef93008d870f61f9014d 100644
--- a/net/quic/chromium/crypto/proof_verifier_chromium.cc
+++ b/net/quic/chromium/crypto/proof_verifier_chromium.cc
@@ -515,19 +515,12 @@ bool ProofVerifierChromium::Job::VerifySignature(const string& signed_data,
     return false;
   }
 
-  if (quic_version <= QUIC_VERSION_30) {
-    verifier.VerifyUpdate(
-        reinterpret_cast<const uint8_t*>(kProofSignatureLabelOld),
-        sizeof(kProofSignatureLabelOld));
-  } else {
-    verifier.VerifyUpdate(
-        reinterpret_cast<const uint8_t*>(kProofSignatureLabel),
-        sizeof(kProofSignatureLabel));
-    uint32_t len = chlo_hash.length();
-    verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(&len), sizeof(len));
-    verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(chlo_hash.data()),
-                          len);
-  }
+  verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(kProofSignatureLabel),
+                        sizeof(kProofSignatureLabel));
+  uint32_t len = chlo_hash.length();
+  verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(&len), sizeof(len));
+  verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(chlo_hash.data()),
+                        len);
 
   verifier.VerifyUpdate(reinterpret_cast<const uint8_t*>(signed_data.data()),
                         signed_data.size());