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 2c8fc625ef7eec1c7992f7f9b5c9135b45012c85..0f5371d14453a57406ed961871e4df0941f1a063 100644 |
--- a/net/http/http_stream_factory_test_util.cc |
+++ b/net/http/http_stream_factory_test_util.cc |
@@ -26,6 +26,8 @@ MockHttpStreamFactoryImplJob::MockHttpStreamFactoryImplJob( |
const SSLConfig& proxy_ssl_config, |
HostPortPair destination, |
GURL origin_url, |
+ NextProto alternative_protocol, |
+ const ProxyServer& alternative_proxy_server, |
bool enable_ip_based_pooling, |
NetLog* net_log) |
: HttpStreamFactoryImpl::Job(delegate, |
@@ -38,41 +40,13 @@ MockHttpStreamFactoryImplJob::MockHttpStreamFactoryImplJob( |
proxy_ssl_config, |
destination, |
origin_url, |
+ alternative_protocol, |
+ alternative_proxy_server, |
enable_ip_based_pooling, |
net_log) { |
DCHECK(!is_waiting()); |
} |
-MockHttpStreamFactoryImplJob::MockHttpStreamFactoryImplJob( |
- HttpStreamFactoryImpl::Job::Delegate* delegate, |
- HttpStreamFactoryImpl::JobType job_type, |
- HttpNetworkSession* session, |
- const HttpRequestInfo& request_info, |
- RequestPriority priority, |
- ProxyInfo proxy_info, |
- const SSLConfig& server_ssl_config, |
- const SSLConfig& proxy_ssl_config, |
- HostPortPair destination, |
- GURL origin_url, |
- AlternativeService alternative_service, |
- const ProxyServer& alternative_proxy_server, |
- bool enable_ip_based_pooling, |
- NetLog* net_log) |
- : HttpStreamFactoryImpl::Job(delegate, |
- job_type, |
- session, |
- request_info, |
- priority, |
- proxy_info, |
- server_ssl_config, |
- proxy_ssl_config, |
- destination, |
- origin_url, |
- alternative_service, |
- alternative_proxy_server, |
- enable_ip_based_pooling, |
- net_log) {} |
- |
MockHttpStreamFactoryImplJob::~MockHttpStreamFactoryImplJob() {} |
TestJobFactory::TestJobFactory() |
@@ -100,8 +74,8 @@ std::unique_ptr<HttpStreamFactoryImpl::Job> TestJobFactory::CreateMainJob( |
auto main_job = base::MakeUnique<MockHttpStreamFactoryImplJob>( |
delegate, job_type, session, request_info, priority, proxy_info, |
- SSLConfig(), SSLConfig(), destination, origin_url, |
- enable_ip_based_pooling, nullptr); |
+ SSLConfig(), SSLConfig(), destination, origin_url, kProtoUnknown, |
+ ProxyServer(), enable_ip_based_pooling, nullptr); |
// Keep raw pointer to Job but pass ownership. |
main_job_ = main_job.get(); |
@@ -120,12 +94,12 @@ std::unique_ptr<HttpStreamFactoryImpl::Job> TestJobFactory::CreateAltSvcJob( |
const SSLConfig& proxy_ssl_config, |
HostPortPair destination, |
GURL origin_url, |
- AlternativeService alternative_service, |
+ NextProto alternative_protocol, |
bool enable_ip_based_pooling, |
NetLog* net_log) { |
auto alternative_job = base::MakeUnique<MockHttpStreamFactoryImplJob>( |
delegate, job_type, session, request_info, priority, proxy_info, |
- SSLConfig(), SSLConfig(), destination, origin_url, alternative_service, |
+ SSLConfig(), SSLConfig(), destination, origin_url, alternative_protocol, |
ProxyServer(), enable_ip_based_pooling, nullptr); |
// Keep raw pointer to Job but pass ownership. |
@@ -150,7 +124,7 @@ std::unique_ptr<HttpStreamFactoryImpl::Job> TestJobFactory::CreateAltProxyJob( |
NetLog* net_log) { |
auto alternative_job = base::MakeUnique<MockHttpStreamFactoryImplJob>( |
delegate, job_type, session, request_info, priority, proxy_info, |
- SSLConfig(), SSLConfig(), destination, origin_url, AlternativeService(), |
+ SSLConfig(), SSLConfig(), destination, origin_url, kProtoUnknown, |
alternative_proxy_server, enable_ip_based_pooling, nullptr); |
// Keep raw pointer to Job but pass ownership. |