net/http/http_stream_factory_impl_unittest.cc - Issue 2546533003: Respect QuicAllowed policy for new streams

Unified Diff: net/http/http_stream_factory_impl_unittest.cc

Issue 2546533003: Respect QuicAllowed policy for new streams (Closed)

Patch Set: IOS io_thread also initializes DynamicSharedParams Created 4 years 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_network_session.h ('K') | « net/http/http_stream_factory_impl_job_controller.cc ('k') | net/quic/chromium/quic_end_to_end_unittest.cc » ('j') | net/url_request/url_request_quic_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_stream_factory_impl_unittest.cc

diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc

index a33649090be28b3467eada923cb91343779cb0e5..822c21bb8ac89d9b1ce03ae7fb662ea512419dba 100644

--- a/net/http/http_stream_factory_impl_unittest.cc

+++ b/net/http/http_stream_factory_impl_unittest.cc

@@ -729,7 +729,9 @@ TEST_F(HttpStreamFactoryTest, QuicProxyMarkedAsBad) {

ProxyService::CreateFixedFromPacResult("QUIC bad:99; DIRECT");

HttpNetworkSession::Params params;

- params.enable_quic = true;

+ HttpNetworkSession::DynamicSharedParams dynamic_shared_params;

+ dynamic_shared_params.enable_quic = true;

+ params.dynamic_shared_params = &dynamic_shared_params;

params.quic_disable_preconnect_if_0rtt = false;

scoped_refptr<SSLConfigServiceDefaults> ssl_config_service(

new SSLConfigServiceDefaults);

@@ -864,8 +866,10 @@ void SetupForQuicAlternativeProxyTest(

SSLConfigServiceDefaults* ssl_config_service,

MockHostResolver* host_resolver,

TransportSecurityState* transport_security_state,

- bool set_alternative_proxy_server) {

- params->enable_quic = true;

+ bool set_alternative_proxy_server,

+ HttpNetworkSession::DynamicSharedParams* dynamic_shared_parmas) {

+ params->dynamic_shared_params = dynamic_shared_parmas;

+ params->dynamic_shared_params->enable_quic = true;

params->quic_disable_preconnect_if_0rtt = false;

params->client_socket_factory = socket_factory;

params->host_resolver = host_resolver;

@@ -898,6 +902,7 @@ TEST_F(HttpStreamFactoryTest, WithQUICAlternativeProxyMarkedAsBad) {

for (auto set_alternative_proxy_server :

set_alternative_proxy_server_values) {

HttpNetworkSession::Params params;

+ HttpNetworkSession::DynamicSharedParams dynamic_shared_params;

MockClientSocketFactory socket_factory;

std::unique_ptr<ProxyService> proxy_service =

ProxyService::CreateFixedFromPacResult(

@@ -915,7 +920,8 @@ TEST_F(HttpStreamFactoryTest, WithQUICAlternativeProxyMarkedAsBad) {

&params, &socket_factory, proxy_service.get(), &test_proxy_delegate,

&http_server_properties, &cert_verifier, &ct_policy_enforcer,

&ct_verifier, ssl_config_service.get(), &host_resolver,

- &transport_security_state, set_alternative_proxy_server);

+ &transport_security_state, set_alternative_proxy_server,

+ &dynamic_shared_params);

std::unique_ptr<HttpNetworkSession> session(

new HttpNetworkSession(params));

@@ -1016,6 +1022,7 @@ TEST_F(HttpStreamFactoryTest, WithQUICAlternativeProxyMarkedAsBad) {

TEST_F(HttpStreamFactoryTest, WithQUICAlternativeProxyNotMarkedAsBad) {

for (auto mock_error : quic_proxy_test_mock_errors) {

HttpNetworkSession::Params params;

+ HttpNetworkSession::DynamicSharedParams dynamic_shared_parmas;

MockClientSocketFactory socket_factory;

std::unique_ptr<ProxyService> proxy_service =

ProxyService::CreateFixedFromPacResult("HTTPS badproxy:99; DIRECT");

@@ -1034,7 +1041,7 @@ TEST_F(HttpStreamFactoryTest, WithQUICAlternativeProxyNotMarkedAsBad) {

&params, &socket_factory, proxy_service.get(), &test_proxy_delegate,

&http_server_properties, &cert_verifier, &ct_policy_enforcer,

&ct_verifier, ssl_config_service.get(), &host_resolver,

- &transport_security_state, true);

+ &transport_security_state, true, &dynamic_shared_parmas);

HostPortPair host_port_pair("badproxy", 99);

std::unique_ptr<HttpNetworkSession> session(new HttpNetworkSession(params));

@@ -1130,7 +1137,9 @@ TEST_F(HttpStreamFactoryTest, UsePreConnectIfNoZeroRTT) {

// Setup params to disable preconnect, but QUIC doesn't 0RTT.

HttpNetworkSession::Params params =

SpdySessionDependencies::CreateSessionParams(&session_deps);

- params.enable_quic = true;

+ HttpNetworkSession::DynamicSharedParams dynamic_shared_params;

Bence 2016/12/20 14:58:07 There should be no need to create an instance here

pmarko 2016/12/20 18:00:37 Good catch!! Done.

+ dynamic_shared_params.enable_quic = true;

+ params.dynamic_shared_params = &dynamic_shared_params;

params.quic_disable_preconnect_if_0rtt = true;

params.http_server_properties = &http_server_properties;

@@ -1184,7 +1193,9 @@ TEST_F(HttpStreamFactoryTest, QuicDisablePreConnectIfZeroRtt) {

// Setup params to disable preconnect, but QUIC does 0RTT.

HttpNetworkSession::Params params =

SpdySessionDependencies::CreateSessionParams(&session_deps);

- params.enable_quic = true;

+ HttpNetworkSession::DynamicSharedParams dynamic_shared_params;

Bence 2016/12/20 14:58:07 Same here.

pmarko 2016/12/20 18:00:37 Done.

+ dynamic_shared_params.enable_quic = true;

+ params.dynamic_shared_params = &dynamic_shared_params;

params.quic_disable_preconnect_if_0rtt = true;

params.http_server_properties = &http_server_properties;

@@ -1242,7 +1253,9 @@ TEST_F(HttpStreamFactoryTest, ProxyDelegateDisablesPreconnect) {

SpdySessionDependencies session_deps;

HttpNetworkSession::Params params =

SpdySessionDependencies::CreateSessionParams(&session_deps);

- params.enable_quic = true;

+ HttpNetworkSession::DynamicSharedParams dynamic_shared_params;

Bence 2016/12/20 14:58:07 Same here.

pmarko 2016/12/20 18:00:37 Done.

+ dynamic_shared_params.enable_quic = true;

+ params.dynamic_shared_params = &dynamic_shared_params;

params.proxy_service = proxy_service.get();

params.http_server_properties = &http_server_properties;

@@ -2002,7 +2015,8 @@ class HttpStreamFactoryBidirectionalQuicTest

}

void Initialize() {

- params_.enable_quic = true;

+ dynamic_shared_params_.enable_quic = true;

+ params_.dynamic_shared_params = &dynamic_shared_params_;

params_.http_server_properties = &http_server_properties_;

params_.quic_host_whitelist.insert("www.example.org");

params_.quic_random = &random_generator_;

@@ -2073,6 +2087,7 @@ class HttpStreamFactoryBidirectionalQuicTest

std::unique_ptr<ProxyService> proxy_service_;

scoped_refptr<SSLConfigServiceDefaults> ssl_config_service_;

HttpNetworkSession::Params params_;

+ HttpNetworkSession::DynamicSharedParams dynamic_shared_params_;

};

INSTANTIATE_TEST_CASE_P(Version,