Land Recent QUIC changes.

net/quic/crypto/proof_test.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 "base/files/file_path.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/cert_status_flags.h"
 #include "net/cert/cert_verify_result.h"
@@ skipping 17 matching lines @@
   scoped_ptr<ProofVerifier> verifier(
       CryptoTestUtils::ProofVerifierForTesting());
 
   const string server_config = "server config bytes";
   const string hostname = "test.example.com";
   const vector<string>* certs;
   const vector<string>* first_certs;
   string error_details, signature, first_signature;
   CertVerifyResult cert_verify_result;
 
-  ASSERT_TRUE(source->GetProof(hostname, server_config, &first_certs,
-                               &first_signature));
-  ASSERT_TRUE(source->GetProof(hostname, server_config, &certs, &signature));
+  ASSERT_TRUE(source->GetProof(hostname, server_config, false /* no ECDSA */,
+                               &first_certs, &first_signature));
+  ASSERT_TRUE(source->GetProof(hostname, server_config, false /* no ECDSA */,
+                               &certs, &signature));
 
   // Check that the proof source is caching correctly:
   ASSERT_EQ(first_certs, certs);
   ASSERT_EQ(signature, first_signature);
 
   int rv;
   TestCompletionCallback callback;
   rv = verifier->VerifyProof(hostname, server_config, *certs, signature,
                              &error_details, &cert_verify_result,
                              callback.callback());
@@ skipping 340 matching lines @@
                                &error_details, &cert_verify_result,
                                callback.callback());
     rv = callback.GetResult(rv);
     ASSERT_EQ(ERR_FAILED, rv);
     ASSERT_NE("", error_details);
   }
 }
 
 }  // namespace test
 }  // namespace net