net/http/http_stream_factory_test_util.cc - Issue 2814633003: Extract Proxy Resolution out of HttpStreamFactoryImpl::Job

Unified Diff: net/http/http_stream_factory_test_util.cc

Issue 2814633003: Extract Proxy Resolution out of HttpStreamFactoryImpl::Job (Closed)

Patch Set: temp (do not review this patch. review next patch) Created 3 years, 8 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

« net/http/http_stream_factory_impl_job_controller_unittest.cc ('K') | « net/http/http_stream_factory_test_util.h ('k') | net/quic/chromium/quic_stream_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 55fb736e568db1042749cc56fb1a205976fb62f4..58252aaed24106872097535907dc2ca7d42fb5c7 100644

--- a/net/http/http_stream_factory_test_util.cc

+++ b/net/http/http_stream_factory_test_util.cc

@@ -19,6 +19,7 @@ MockHttpStreamFactoryImplJob::MockHttpStreamFactoryImplJob(

HttpNetworkSession* session,

const HttpRequestInfo& request_info,

RequestPriority priority,

+ ProxyInfo proxy_info,

const SSLConfig& server_ssl_config,

const SSLConfig& proxy_ssl_config,

HostPortPair destination,

@@ -30,6 +31,7 @@ MockHttpStreamFactoryImplJob::MockHttpStreamFactoryImplJob(

session,

request_info,

priority,

+ proxy_info,

server_ssl_config,

proxy_ssl_config,

destination,

@@ -45,6 +47,7 @@ MockHttpStreamFactoryImplJob::MockHttpStreamFactoryImplJob(

HttpNetworkSession* session,

const HttpRequestInfo& request_info,

RequestPriority priority,

+ ProxyInfo proxy_info,

const SSLConfig& server_ssl_config,

const SSLConfig& proxy_ssl_config,

HostPortPair destination,

@@ -58,6 +61,7 @@ MockHttpStreamFactoryImplJob::MockHttpStreamFactoryImplJob(

session,

request_info,

priority,

+ proxy_info,

server_ssl_config,

proxy_ssl_config,

destination,

@@ -82,6 +86,7 @@ HttpStreamFactoryImpl::Job* TestJobFactory::CreateJob(

HttpNetworkSession* session,

const HttpRequestInfo& request_info,

RequestPriority priority,

+ ProxyInfo proxy_info,

const SSLConfig& server_ssl_config,

const SSLConfig& proxy_ssl_config,

HostPortPair destination,

@@ -94,8 +99,9 @@ HttpStreamFactoryImpl::Job* TestJobFactory::CreateJob(

origin_url = main_job_alternative_url_;

main_job_ = new MockHttpStreamFactoryImplJob(

- delegate, job_type, session, request_info, priority, SSLConfig(),

- SSLConfig(), destination, origin_url, enable_ip_based_pooling, nullptr);

+ delegate, job_type, session, request_info, priority, proxy_info,

+ SSLConfig(), SSLConfig(), destination, origin_url,

+ enable_ip_based_pooling, nullptr);

return main_job_;

}

@@ -106,6 +112,7 @@ HttpStreamFactoryImpl::Job* TestJobFactory::CreateJob(

HttpNetworkSession* session,

const HttpRequestInfo& request_info,

RequestPriority priority,

+ ProxyInfo proxy_info,

const SSLConfig& server_ssl_config,

const SSLConfig& proxy_ssl_config,

HostPortPair destination,

@@ -115,9 +122,9 @@ HttpStreamFactoryImpl::Job* TestJobFactory::CreateJob(

NetLog* net_log) {

DCHECK(!alternative_job_);

alternative_job_ = new MockHttpStreamFactoryImplJob(

- delegate, job_type, session, request_info, priority, SSLConfig(),

- SSLConfig(), destination, origin_url, alternative_service, ProxyServer(),

- enable_ip_based_pooling, nullptr);

+ delegate, job_type, session, request_info, priority, proxy_info,

+ SSLConfig(), SSLConfig(), destination, origin_url, alternative_service,

+ ProxyServer(), enable_ip_based_pooling, nullptr);

return alternative_job_;

}

@@ -128,6 +135,7 @@ HttpStreamFactoryImpl::Job* TestJobFactory::CreateJob(

HttpNetworkSession* session,

const HttpRequestInfo& request_info,

RequestPriority priority,

+ ProxyInfo proxy_info,

const SSLConfig& server_ssl_config,

const SSLConfig& proxy_ssl_config,

HostPortPair destination,

@@ -137,8 +145,8 @@ HttpStreamFactoryImpl::Job* TestJobFactory::CreateJob(

NetLog* net_log) {

DCHECK(!alternative_job_);

alternative_job_ = new MockHttpStreamFactoryImplJob(

- delegate, job_type, session, request_info, priority, SSLConfig(),

- SSLConfig(), destination, origin_url, AlternativeService(),

+ delegate, job_type, session, request_info, priority, proxy_info,

+ SSLConfig(), SSLConfig(), destination, origin_url, AlternativeService(),

alternative_proxy_server, enable_ip_based_pooling, nullptr);

return alternative_job_;