Refactoring: Make QuicSignedServerConfig contain a QuicCryptoProof

net/quic/core/crypto/quic_crypto_server_config.h

 // Copyright 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.
 
 #ifndef NET_QUIC_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_
 #define NET_QUIC_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string_piece.h"
 #include "base/synchronization/lock.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_export.h"
 #include "net/quic/core/crypto/crypto_handshake.h"
 #include "net/quic/core/crypto/crypto_handshake_message.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
 #include "net/quic/core/crypto/crypto_secret_boxer.h"
 #include "net/quic/core/crypto/proof_source.h"
 #include "net/quic/core/crypto/quic_compressed_certs_cache.h"
+#include "net/quic/core/crypto/quic_crypto_proof.h"
 #include "net/quic/core/proto/cached_network_parameters.pb.h"
 #include "net/quic/core/proto/source_address_token.pb.h"
 #include "net/quic/core/quic_time.h"
 #include "net/quic/platform/api/quic_socket_address.h"
 
 namespace net {
 
 class CryptoHandshakeMessage;
 class EphemeralKeySource;
 class KeyExchange;
@@ skipping 742 matching lines @@
   // Does not own this observer.
   RejectionObserver* rejection_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicCryptoServerConfig);
 };
 
 struct NET_EXPORT_PRIVATE QuicSignedServerConfig
     : public base::RefCounted<QuicSignedServerConfig> {
   QuicSignedServerConfig();
 
-  // TODO(eranm): Have a QuicCryptoProof field instead of signature, cert_sct.
-  std::string signature;
+  QuicCryptoProof proof;
   scoped_refptr<ProofSource::Chain> chain;
-  std::string cert_sct;
   // The server config that is used for this proof (and the rest of the
   // request).
   scoped_refptr<QuicCryptoServerConfig::Config> config;
   std::string primary_scid;
-  // Indication whether the Expect-CT header should be sent on the session
-  // this proof relates to (for background, see
-  // https://www.ietf.org/id/draft-stark-expect-ct-00.txt).
-  // NOTE: This field is intentionally independent from the |cert_sct| one
-  // and can be true even if |cert_sct| is empty.
-  // The goal of the Expect-CT header is uncover cases where valid SCTs are
-  // expected to be served, but aren't.
-  bool send_expect_ct_header;
 
  private:
   friend class base::RefCounted<QuicSignedServerConfig>;
   virtual ~QuicSignedServerConfig();
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_