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

net/quic/test_tools/crypto_test_utils_chromium.cc

Index: net/quic/test_tools/crypto_test_utils_chromium.cc
diff --git a/net/quic/test_tools/crypto_test_utils_chromium.cc b/net/quic/test_tools/crypto_test_utils_chromium.cc
index ffa1788c0148daa6acbf26631566b825765011dc..8ff3c97753300f0b081f792d6be99e4d8311a3f4 100644
--- a/net/quic/test_tools/crypto_test_utils_chromium.cc
+++ b/net/quic/test_tools/crypto_test_utils_chromium.cc
@@ -50,6 +50,7 @@ class TestProofVerifierChromium : public ProofVerifierChromium {
 const char kLeafCert[] = "leaf";
 const char kIntermediateCert[] = "intermediate";
 const char kSignature[] = "signature";
+const char kSCT[] = "CryptoServerTests";
 
 class FakeProofSource : public ProofSource {
  public:
@@ -65,9 +66,11 @@ class FakeProofSource : 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 {
     *out_certs = &certs_;
     *out_signature = kSignature;
+    *out_leaf_cert_sct = kSCT;
     return true;
   }
 
@@ -117,7 +120,8 @@ ProofSource* CryptoTestUtils::ProofSourceForTesting() {
   base::FilePath certs_dir = GetTestCertsDirectory();
   CHECK(source->Initialize(
       certs_dir.AppendASCII("quic_test.example.com.crt"),
-      certs_dir.AppendASCII("quic_test.example.com.key.pkcs8")));
+      certs_dir.AppendASCII("quic_test.example.com.key.pkcs8"),
+      certs_dir.AppendASCII("quic_test.example.com.key.sct")));
   return source;
 }