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

Unified Diff: net/http/http_stream_factory_test_util.cc

Issue 2260623002: Race TCP connection to proxies with QUIC connections (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test fix Created 4 years, 4 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 | « net/http/http_stream_factory_test_util.h ('k') | net/proxy/proxy_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_test_util.cc
diff --git a/net/http/http_stream_factory_test_util.cc b/net/http/http_stream_factory_test_util.cc
index ca26a986d507b817acd308fea74ff9edc9959325..62d89c2c3f4fb69a0ea1b8f6e2449bed9ad68023 100644
--- a/net/http/http_stream_factory_test_util.cc
+++ b/net/http/http_stream_factory_test_util.cc
@@ -46,6 +46,7 @@ MockHttpStreamFactoryImplJob::MockHttpStreamFactoryImplJob(
HostPortPair destination,
GURL origin_url,
AlternativeService alternative_service,
+ const ProxyServer& alternative_proxy_server,
NetLog* net_log)
: HttpStreamFactoryImpl::Job(delegate,
job_type,
@@ -57,6 +58,7 @@ MockHttpStreamFactoryImplJob::MockHttpStreamFactoryImplJob(
destination,
origin_url,
alternative_service,
+ alternative_proxy_server,
net_log) {}
MockHttpStreamFactoryImplJob::~MockHttpStreamFactoryImplJob() {}
@@ -106,7 +108,29 @@ HttpStreamFactoryImpl::Job* TestJobFactory::CreateJob(
DCHECK(!alternative_job_);
alternative_job_ = new MockHttpStreamFactoryImplJob(
delegate, job_type, session, request_info, priority, SSLConfig(),
- SSLConfig(), destination, origin_url, alternative_service, nullptr);
+ SSLConfig(), destination, origin_url, alternative_service, ProxyServer(),
+ nullptr);
+
+ return alternative_job_;
+}
+
+HttpStreamFactoryImpl::Job* TestJobFactory::CreateJob(
+ HttpStreamFactoryImpl::Job::Delegate* delegate,
+ HttpStreamFactoryImpl::JobType job_type,
+ HttpNetworkSession* session,
+ const HttpRequestInfo& request_info,
+ RequestPriority priority,
+ const SSLConfig& server_ssl_config,
+ const SSLConfig& proxy_ssl_config,
+ HostPortPair destination,
+ GURL origin_url,
+ const ProxyServer& alternative_proxy_server,
+ NetLog* net_log) {
+ DCHECK(!alternative_job_);
+ alternative_job_ = new MockHttpStreamFactoryImplJob(
+ delegate, job_type, session, request_info, priority, SSLConfig(),
+ SSLConfig(), destination, origin_url, AlternativeService(),
+ alternative_proxy_server, nullptr);
return alternative_job_;
}
« no previous file with comments | « net/http/http_stream_factory_test_util.h ('k') | net/proxy/proxy_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698