| 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..e6f01712d0b675f9ffd77bf9ff65455d95d9a705 100644
|
| --- a/net/http/http_stream_factory_test_util.cc
|
| +++ b/net/http/http_stream_factory_test_util.cc
|
| @@ -54,7 +54,7 @@ MockHttpStreamFactoryImplJob::MockHttpStreamFactoryImplJob(
|
| const SSLConfig& proxy_ssl_config,
|
| HostPortPair destination,
|
| GURL origin_url,
|
| - AlternativeService alternative_service,
|
| + const AlternativeServiceInfo& alternative_service_info,
|
| const ProxyServer& alternative_proxy_server,
|
| bool enable_ip_based_pooling,
|
| NetLog* net_log)
|
| @@ -68,7 +68,7 @@ MockHttpStreamFactoryImplJob::MockHttpStreamFactoryImplJob(
|
| proxy_ssl_config,
|
| destination,
|
| origin_url,
|
| - alternative_service,
|
| + alternative_service_info,
|
| alternative_proxy_server,
|
| enable_ip_based_pooling,
|
| net_log) {}
|
| @@ -120,13 +120,14 @@ std::unique_ptr<HttpStreamFactoryImpl::Job> TestJobFactory::CreateAltSvcJob(
|
| const SSLConfig& proxy_ssl_config,
|
| HostPortPair destination,
|
| GURL origin_url,
|
| - AlternativeService alternative_service,
|
| + const AlternativeServiceInfo& alternative_service_info,
|
| 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,
|
| - ProxyServer(), enable_ip_based_pooling, nullptr);
|
| + SSLConfig(), SSLConfig(), destination, origin_url,
|
| + alternative_service_info, ProxyServer(), enable_ip_based_pooling,
|
| + nullptr);
|
|
|
| // Keep raw pointer to Job but pass ownership.
|
| alternative_job_ = alternative_job.get();
|
| @@ -150,8 +151,9 @@ 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(),
|
| - alternative_proxy_server, enable_ip_based_pooling, nullptr);
|
| + SSLConfig(), SSLConfig(), destination, origin_url,
|
| + AlternativeServiceInfo(), alternative_proxy_server,
|
| + enable_ip_based_pooling, nullptr);
|
|
|
| // Keep raw pointer to Job but pass ownership.
|
| alternative_job_ = alternative_job.get();
|
|
|