Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(683)

Unified Diff: components/cronet/ios/test/quic_test_server.cc

Issue 2146643002: [Cronet] Integrate CrNet functionality into Cronet on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove cronet_test_bundle_data target and use data bundled with net_test_support. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/cronet/ios/test/cronet_http_test.mm ('k') | components/cronet/ios/test/test_server.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/ios/test/quic_test_server.cc
diff --git a/components/cronet/ios/test/quic_test_server.cc b/components/cronet/ios/test/quic_test_server.cc
index 67b887e4ebc3a174fdcaff6b269cedd43553ad21..5b719a984d7e6f6f435d934cdfc119a616781ed9 100644
--- a/components/cronet/ios/test/quic_test_server.cc
+++ b/components/cronet/ios/test/quic_test_server.cc
@@ -50,10 +50,10 @@ void SetupQuicInMemoryCache() {
return;
setup_done = true;
net::SpdyHeaderBlock headers;
- headers.ReplaceOrAppendHeader(kHelloHeaderName, kHelloHeaderValue);
- headers.ReplaceOrAppendHeader(kStatusHeader, kHelloStatus);
+ headers.AppendValueOrAddHeader(kHelloHeaderName, kHelloHeaderValue);
+ headers.AppendValueOrAddHeader(kStatusHeader, kHelloStatus);
net::SpdyHeaderBlock trailers;
- trailers.ReplaceOrAppendHeader(kHelloTrailerName, kHelloTrailerValue);
+ trailers.AppendValueOrAddHeader(kHelloTrailerName, kHelloTrailerValue);
net::QuicInMemoryCache::GetInstance()->AddResponse(
kTestServerHost, kHelloPath, std::move(headers), kHelloBodyValue,
std::move(trailers));
@@ -108,12 +108,12 @@ bool StartQuicTestServer() {
base::FilePath test_files_root;
if (!PathService::Get(base::DIR_EXE, &test_files_root))
return false;
-
base::WaitableEvent server_started_event(
base::WaitableEvent::ResetPolicy::MANUAL,
base::WaitableEvent::InitialState::NOT_SIGNALED);
g_quic_server_thread->task_runner()->PostTask(
- FROM_HERE, base::Bind(&StartQuicServerOnServerThread, test_files_root,
+ FROM_HERE, base::Bind(&StartQuicServerOnServerThread,
+ test_files_root.Append("net/data/ssl/certificates"),
&server_started_event));
server_started_event.Wait();
return true;
« no previous file with comments | « components/cronet/ios/test/cronet_http_test.mm ('k') | components/cronet/ios/test/test_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698