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

Unified Diff: net/url_request/url_request_quic_unittest.cc

Issue 2693083002: Server push cancellation: fix host resolver set up in URLRequestQuicTest (Closed)
Patch Set: address rch's comments Created 3 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/url_request/url_request_quic_unittest.cc
diff --git a/net/url_request/url_request_quic_unittest.cc b/net/url_request/url_request_quic_unittest.cc
index a7132657ead39ab4c383d072dcf955fd4963d2e7..7532196988f52ad3238b3bdcf438f345d128083f 100644
--- a/net/url_request/url_request_quic_unittest.cc
+++ b/net/url_request/url_request_quic_unittest.cc
@@ -35,7 +35,7 @@ namespace {
// This must match the certificate used (quic_test.example.com.crt and
// quic_test.example.com.key.pkcs8).
const int kTestServerPort = 6121;
-const char kTestServerHost[] = "test.example.com:6121";
+const char kTestServerHost[] = "test.example.com";
// Used as a simple response from the server.
const char kHelloPath[] = "/hello.txt";
const char kHelloBodyValue[] = "Hello from QUIC Server";
@@ -61,11 +61,10 @@ class URLRequestQuicTest : public ::testing::Test {
OK);
// To simplify the test, and avoid the race with the HTTP request, we force
// QUIC for these requests.
- params->origins_to_force_quic_on.insert(
- HostPortPair::FromString(kTestServerHost));
+ params->origins_to_force_quic_on.insert(HostPortPair(kTestServerHost, 443));
params->cert_verifier = &cert_verifier_;
params->enable_quic = true;
- params->host_resolver = host_resolver_.get();
+ context_->set_host_resolver(host_resolver_.get());
context_->set_http_network_session_params(std::move(params));
context_->set_cert_verifier(&cert_verifier_);
}
@@ -114,7 +113,7 @@ class URLRequestQuicTest : public ::testing::Test {
std::unique_ptr<MockHostResolver> resolver(new MockHostResolver());
resolver->rules()->AddRule("test.example.com", "127.0.0.1");
host_resolver_.reset(new MappedHostResolver(std::move(resolver)));
- // Use a mapped host resolver so that request for test.example.com (port 80)
+ // Use a mapped host resolver so that request for test.example.com
// reach the server running on localhost.
std::string map_rule = "MAP test.example.com test.example.com:" +
base::IntToString(server_->server_address().port());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698