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

Unified Diff: components/grpc_support/test/quic_test_server.cc

Issue 2273403003: Moving gRPC support interfaces out of cronet and into a new component. (Closed)
Patch Set: Address comments 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/grpc_support/test/quic_test_server.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/grpc_support/test/quic_test_server.cc
diff --git a/components/cronet/ios/test/quic_test_server.cc b/components/grpc_support/test/quic_test_server.cc
similarity index 85%
rename from components/cronet/ios/test/quic_test_server.cc
rename to components/grpc_support/test/quic_test_server.cc
index 5b719a984d7e6f6f435d934cdfc119a616781ed9..048810c3db4e7d5abf8406ddbc491a7cc0166cf5 100644
--- a/components/cronet/ios/test/quic_test_server.cc
+++ b/components/grpc_support/test/quic_test_server.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/cronet/ios/test/quic_test_server.h"
+#include "components/grpc_support/test/quic_test_server.h"
#include <utility>
@@ -20,7 +20,7 @@
#include "net/tools/quic/quic_in_memory_cache.h"
#include "net/tools/quic/quic_simple_server.h"
-namespace cronet {
+namespace grpc_support {
// This must match the certificate used (quic_test.example.com.crt and
// quic_test.example.com.key.pkcs8).
@@ -50,10 +50,10 @@ void SetupQuicInMemoryCache() {
return;
setup_done = true;
net::SpdyHeaderBlock headers;
- headers.AppendValueOrAddHeader(kHelloHeaderName, kHelloHeaderValue);
- headers.AppendValueOrAddHeader(kStatusHeader, kHelloStatus);
+ headers[kHelloHeaderName] = kHelloHeaderValue;
+ headers[kStatusHeader] = kHelloStatus;
net::SpdyHeaderBlock trailers;
- trailers.AppendValueOrAddHeader(kHelloTrailerName, kHelloTrailerValue);
+ trailers[kHelloTrailerName] = kHelloTrailerValue;
net::QuicInMemoryCache::GetInstance()->AddResponse(
kTestServerHost, kHelloPath, std::move(headers), kHelloBodyValue,
std::move(trailers));
@@ -73,9 +73,9 @@ void StartQuicServerOnServerThread(const base::FilePath& test_files_root,
std::unique_ptr<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.sct")));
+ directory.AppendASCII("quic_test.example.com.crt"),
+ directory.AppendASCII("quic_test.example.com.key.pkcs8"),
+ directory.AppendASCII("quic_test.example.com.key.sct")));
g_quic_server =
new net::QuicSimpleServer(std::move(proof_source), config,
net::QuicCryptoServerConfig::ConfigOptions(),
@@ -105,15 +105,13 @@ bool StartQuicTestServer() {
thread_options.message_loop_type = base::MessageLoop::TYPE_IO;
bool started = g_quic_server_thread->StartWithOptions(thread_options);
DCHECK(started);
- base::FilePath test_files_root;
- if (!PathService::Get(base::DIR_EXE, &test_files_root))
- return false;
+ base::FilePath test_files_root = net::GetTestCertsDirectory();
+
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.Append("net/data/ssl/certificates"),
+ FROM_HERE, base::Bind(&StartQuicServerOnServerThread, test_files_root,
&server_started_event));
server_started_event.Wait();
return true;
@@ -133,4 +131,4 @@ void ShutdownQuicTestServer() {
g_quic_server_thread = nullptr;
}
-} // namespace cronet
+} // namespace grpc_support
« no previous file with comments | « components/grpc_support/test/quic_test_server.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698