diff options
| author | Mohannad Farrag <aymanm@google.com> | 2023-08-25 15:36:38 +0000 |
|---|---|---|
| committer | Mohannad Farrag <aymanm@google.com> | 2023-08-25 16:40:49 +0000 |
| commit | 75b52b5230565b583f926a7629db398e1a2c9052 (patch) | |
| tree | c7191342cd803d5753db9e88f5a61e37939b140d /components/cronet/android/test | |
| parent | 53281872f5fc70c0b64502a14181deeb64abd5b7 (diff) | |
| download | cronet-75b52b5230565b583f926a7629db398e1a2c9052.tar.gz | |
Cronet Import: Fix incorrectly solved merge conflicts
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2709854/3/components/cronet/android/test/quic_test_server.cc#b69
Change-Id: I5e8cebee623ff1cab78701bce84c4f17b492fec0
Diffstat (limited to 'components/cronet/android/test')
| -rw-r--r-- | components/cronet/android/test/quic_test_server.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/components/cronet/android/test/quic_test_server.cc b/components/cronet/android/test/quic_test_server.cc index 4a2743a0b..254f40d25 100644 --- a/components/cronet/android/test/quic_test_server.cc +++ b/components/cronet/android/test/quic_test_server.cc @@ -62,9 +62,10 @@ void StartOnServerThread(const base::FilePath& test_files_root, // Set up server certs. std::unique_ptr<net::ProofSourceChromium> proof_source( new net::ProofSourceChromium()); - CHECK(proof_source->Initialize(directory.Append("quic-chain.pem"), - directory.Append("quic-leaf-cert.key"), - base::FilePath())); + CHECK(proof_source->Initialize( + test_data_dir.Append("quic-chain.pem"), + test_data_dir.Append("quic-leaf-cert.key"), + base::FilePath())); g_quic_server = std::make_unique<net::QuicSimpleServer>( std::move(proof_source), config, quic::QuicCryptoServerConfig::ConfigOptions(), |