[m53 merge] Update the QUIC compressed cert set.

net/quic/crypto/common_cert_set.cc

 // Copyright (c) 2013 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/crypto/common_cert_set.h"
 
 #include <cstddef>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "net/quic/quic_utils.h"
 
 using base::StringPiece;
 
 namespace net {
 
-namespace common_cert_set_1 {
-#include "net/quic/crypto/common_cert_set_1.c"
-}
-
 namespace common_cert_set_2 {
 #include "net/quic/crypto/common_cert_set_2.c"
 }
 
 namespace common_cert_set_3 {
 #include "net/quic/crypto/common_cert_set_3.c"
 }
 
 namespace {
 
 struct CertSet {
   // num_certs contains the number of certificates in this set.
   size_t num_certs;
   // certs is an array of |num_certs| pointers to the DER encoded certificates.
   const unsigned char* const* certs;
   // lens is an array of |num_certs| integers describing the length, in bytes,
   // of each certificate.
   const size_t* lens;
   // hash contains the 64-bit, FNV-1a hash of this set.
   uint64_t hash;
 };
 
 const CertSet kSets[] = {
     {
-        common_cert_set_1::kNumCerts, common_cert_set_1::kCerts,
-        common_cert_set_1::kLens, common_cert_set_1::kHash,
-    },
-    {
         common_cert_set_2::kNumCerts, common_cert_set_2::kCerts,
         common_cert_set_2::kLens, common_cert_set_2::kHash,
     },
     {
         common_cert_set_3::kNumCerts, common_cert_set_3::kCerts,
         common_cert_set_3::kLens, common_cert_set_3::kHash,
     },
 };
 
 const uint64_t kSetHashes[] = {
-    common_cert_set_1::kHash, common_cert_set_2::kHash,
-    common_cert_set_3::kHash,
+    common_cert_set_2::kHash, common_cert_set_3::kHash,
 };
 
 // Compare returns a value less than, equal to or greater than zero if |a| is
 // lexicographically less than, equal to or greater than |b|, respectively.
 int Compare(StringPiece a, const unsigned char* b, size_t b_len) {
   size_t len = a.size();
   if (len > b_len) {
     len = b_len;
   }
   int n = memcmp(a.data(), b, len);
@@ skipping 96 matching lines @@
 }  // anonymous namespace
 
 CommonCertSets::~CommonCertSets() {}
 
 // static
 const CommonCertSets* CommonCertSets::GetInstanceQUIC() {
   return CommonCertSetsQUIC::GetInstance();
 }
 
 }  // namespace net