Landing Recent QUIC changes until: Fri Oct 30 22:23:58 2015 +0000

net/quic/crypto/proof_source_chromium.h

Index: net/quic/crypto/proof_source_chromium.h
diff --git a/net/quic/crypto/proof_source_chromium.h b/net/quic/crypto/proof_source_chromium.h
index ef5e6768c3419891d59126ac6808716e11349654..fae666a6829eef44e3a2091f34d856e2d30871cc 100644
--- a/net/quic/crypto/proof_source_chromium.h
+++ b/net/quic/crypto/proof_source_chromium.h
@@ -26,9 +26,11 @@ class NET_EXPORT_PRIVATE ProofSourceChromium : public ProofSource {
   ~ProofSourceChromium() override;
 
   // Initializes this object based on the certificate chain in |cert_path|,
-  // and the PKCS#8 RSA private key in |key_path|.
+  // and the PKCS#8 RSA private key in |key_path|. Signed certificate
+  // timestamp may be loaded from |sct_path| if it is non-empty.
   bool Initialize(const base::FilePath& cert_path,
-                  const base::FilePath& key_path);
+                  const base::FilePath& key_path,
+                  const base::FilePath& sct_path);
 
   // ProofSource interface
   bool GetProof(const IPAddressNumber& server_ip,
@@ -36,11 +38,13 @@ class NET_EXPORT_PRIVATE ProofSourceChromium : public ProofSource {
                 const std::string& server_config,
                 bool ecdsa_ok,
                 const std::vector<std::string>** out_certs,
-                std::string* out_signature) override;
+                std::string* out_signature,
+                std::string* out_leaf_cert_sct) override;
 
  private:
   scoped_ptr<crypto::RSAPrivateKey> private_key_;
   std::vector<std::string> certificates_;
+  std::string signed_certificate_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(ProofSourceChromium);
 };