| Index: components/cronet/android/test/quic_test_server.cc
|
| diff --git a/components/cronet/android/test/quic_test_server.cc b/components/cronet/android/test/quic_test_server.cc
|
| index cb6d926a991952d81ec9685ca90778a2cb6a9a17..4738720f7c105b8f28f840e6eabf5147afbacfa8 100644
|
| --- a/components/cronet/android/test/quic_test_server.cc
|
| +++ b/components/cronet/android/test/quic_test_server.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/android/jni_android.h"
|
| #include "base/android/jni_string.h"
|
| +#include "base/android/path_utils.h"
|
| #include "base/bind.h"
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| @@ -13,6 +14,8 @@
|
| #include "jni/QuicTestServer_jni.h"
|
| #include "net/base/ip_endpoint.h"
|
| #include "net/base/net_util.h"
|
| +#include "net/base/test_data_directory.h"
|
| +#include "net/quic/crypto/proof_source_chromium.h"
|
| #include "net/tools/quic/quic_in_memory_cache.h"
|
| #include "net/tools/quic/quic_simple_server.h"
|
|
|
| @@ -20,17 +23,18 @@ namespace cronet {
|
|
|
| namespace {
|
|
|
| -static const char kServerHost[] = "127.0.0.1";
|
| +static const char kServerHost[] = "test.example.com";
|
| static const int kServerPort = 6121;
|
|
|
| base::Thread* g_quic_server_thread = nullptr;
|
| net::tools::QuicSimpleServer* g_quic_server = nullptr;
|
|
|
| -void ServeFilesFromDirectory(
|
| - const base::FilePath& directory) {
|
| +void StartOnServerThread(const base::FilePath& test_files_root) {
|
| DCHECK(g_quic_server_thread->task_runner()->BelongsToCurrentThread());
|
| DCHECK(!g_quic_server);
|
| - base::FilePath file_dir = directory.Append("quic_data");
|
| +
|
| + // Set up in-memory cache.
|
| + base::FilePath file_dir = test_files_root.Append("quic_data");
|
| CHECK(base::PathExists(file_dir)) << "Quic data does not exist";
|
| net::tools::QuicInMemoryCache::GetInstance()->InitializeFromDirectory(
|
| file_dir.value());
|
| @@ -39,6 +43,19 @@ void ServeFilesFromDirectory(
|
| net::QuicConfig config;
|
| g_quic_server =
|
| new net::tools::QuicSimpleServer(config, net::QuicSupportedVersions());
|
| +
|
| + // Set up server certs.
|
| + base::FilePath directory;
|
| + CHECK(base::android::GetExternalStorageDirectory(&directory));
|
| + directory = directory.Append("net/data/ssl/certificates");
|
| + 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")));
|
| + // TODO(xunjieli): Use scoped_ptr when crbug.com/545474 is fixed.
|
| + g_quic_server->SetProofSource(proof_source);
|
| +
|
| + // 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();
|
| @@ -67,7 +84,7 @@ void StartQuicTestServer(JNIEnv* env,
|
| base::FilePath test_files_root(
|
| base::android::ConvertJavaStringToUTF8(env, jtest_files_root));
|
| g_quic_server_thread->task_runner()->PostTask(
|
| - FROM_HERE, base::Bind(&ServeFilesFromDirectory, test_files_root));
|
| + FROM_HERE, base::Bind(&StartOnServerThread, test_files_root));
|
| }
|
|
|
| void ShutdownQuicTestServer(JNIEnv* env,
|
|
|