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

components/cronet/android/test/quic_test_server.cc

 // Copyright 2015 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 "quic_test_server.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/path_utils.h"
 #include "base/bind.h"
@@ skipping 32 matching lines @@
   net::QuicConfig config;
 
   // Set up server certs.
   base::FilePath directory;
   CHECK(base::android::GetExternalStorageDirectory(&directory));
   directory = directory.Append("net/data/ssl/certificates");
   // TODO(xunjieli): Use scoped_ptr when crbug.com/545474 is fixed.
   net::ProofSourceChromium* proof_source = new net::ProofSourceChromium();
   CHECK(proof_source->Initialize(
       directory.Append("quic_test.example.com.crt"),
-      directory.Append("quic_test.example.com.key.pkcs8")));
+      directory.Append("quic_test.example.com.key.pkcs8"),
+      directory.Append("quic_test.example.com.key.sct")));
   g_quic_server = new net::tools::QuicSimpleServer(
       proof_source, config, net::QuicSupportedVersions());
 
   // Start listening.
   int rv = g_quic_server->Listen(net::IPEndPoint(ip, kServerPort));
   CHECK_GE(rv, 0) << "Quic server fails to start";
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_QuicTestServer_onServerStarted(env);
 }
 
@@ skipping 38 matching lines @@
 
 int GetServerPort(JNIEnv* env, const JavaParamRef<jclass>& /*jcaller*/) {
   return kServerPort;
 }
 
 bool RegisterQuicTestServer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace cronet