Commit 6be245c1 authored by bnc's avatar bnc Committed by Commit bot

Simplify test http_server_properties member access.

Append underscore to the name of
QuicNetworkTransactionTest::http_server_properties member to match other
members.  Use it directly instead of *(session_->http_server_properties)
throughout tests.

BUG=

Review URL: https://codereview.chromium.org/1130783008

Cr-Commit-Position: refs/heads/master@{#330078}
parent 0e70c669
...@@ -242,7 +242,7 @@ class QuicNetworkTransactionTest ...@@ -242,7 +242,7 @@ class QuicNetworkTransactionTest
params_.proxy_service = proxy_service_.get(); params_.proxy_service = proxy_service_.get();
params_.ssl_config_service = ssl_config_service_.get(); params_.ssl_config_service = ssl_config_service_.get();
params_.http_auth_handler_factory = auth_handler_factory_.get(); params_.http_auth_handler_factory = auth_handler_factory_.get();
params_.http_server_properties = http_server_properties.GetWeakPtr(); params_.http_server_properties = http_server_properties_.GetWeakPtr();
params_.quic_supported_versions = SupportedVersions(GetParam()); params_.quic_supported_versions = SupportedVersions(GetParam());
if (use_next_protos) { if (use_next_protos) {
...@@ -325,22 +325,22 @@ class QuicNetworkTransactionTest ...@@ -325,22 +325,22 @@ class QuicNetworkTransactionTest
crypto_client_stream_factory_.set_handshake_mode(handshake_mode); crypto_client_stream_factory_.set_handshake_mode(handshake_mode);
HostPortPair host_port_pair = HostPortPair::FromURL(request_.url); HostPortPair host_port_pair = HostPortPair::FromURL(request_.url);
AlternativeService alternative_service(QUIC, host_port_pair.host(), 80); AlternativeService alternative_service(QUIC, host_port_pair.host(), 80);
session_->http_server_properties()->SetAlternativeService( http_server_properties_.SetAlternativeService(host_port_pair,
host_port_pair, alternative_service, 1.0); alternative_service, 1.0);
} }
void ExpectBrokenAlternateProtocolMapping() { void ExpectBrokenAlternateProtocolMapping() {
const HostPortPair origin = HostPortPair::FromURL(request_.url); const HostPortPair origin = HostPortPair::FromURL(request_.url);
const AlternativeService alternative_service = const AlternativeService alternative_service =
session_->http_server_properties()->GetAlternativeService(origin); http_server_properties_.GetAlternativeService(origin);
EXPECT_NE(UNINITIALIZED_ALTERNATE_PROTOCOL, alternative_service.protocol); EXPECT_NE(UNINITIALIZED_ALTERNATE_PROTOCOL, alternative_service.protocol);
EXPECT_TRUE(session_->http_server_properties()->IsAlternativeServiceBroken( EXPECT_TRUE(http_server_properties_.IsAlternativeServiceBroken(
alternative_service)); alternative_service));
} }
void ExpectQuicAlternateProtocolMapping() { void ExpectQuicAlternateProtocolMapping() {
const AlternativeService alternative_service = const AlternativeService alternative_service =
session_->http_server_properties()->GetAlternativeService( http_server_properties_.GetAlternativeService(
HostPortPair::FromURL(request_.url)); HostPortPair::FromURL(request_.url));
EXPECT_EQ(QUIC, alternative_service.protocol); EXPECT_EQ(QUIC, alternative_service.protocol);
} }
...@@ -363,7 +363,7 @@ class QuicNetworkTransactionTest ...@@ -363,7 +363,7 @@ class QuicNetworkTransactionTest
scoped_ptr<ProxyService> proxy_service_; scoped_ptr<ProxyService> proxy_service_;
scoped_ptr<HttpAuthHandlerFactory> auth_handler_factory_; scoped_ptr<HttpAuthHandlerFactory> auth_handler_factory_;
MockRandom random_generator_; MockRandom random_generator_;
HttpServerPropertiesImpl http_server_properties; HttpServerPropertiesImpl http_server_properties_;
HttpNetworkSession::Params params_; HttpNetworkSession::Params params_;
HttpRequestInfo request_; HttpRequestInfo request_;
BoundTestNetLog net_log_; BoundTestNetLog net_log_;
...@@ -623,18 +623,16 @@ TEST_P(QuicNetworkTransactionTest, ConfirmAlternativeService) { ...@@ -623,18 +623,16 @@ TEST_P(QuicNetworkTransactionTest, ConfirmAlternativeService) {
AlternativeService alternative_service(QUIC, AlternativeService alternative_service(QUIC,
HostPortPair::FromURL(request_.url)); HostPortPair::FromURL(request_.url));
session_->http_server_properties()->MarkAlternativeServiceRecentlyBroken( http_server_properties_.MarkAlternativeServiceRecentlyBroken(
alternative_service); alternative_service);
EXPECT_TRUE( EXPECT_TRUE(http_server_properties_.WasAlternativeServiceRecentlyBroken(
session_->http_server_properties()->WasAlternativeServiceRecentlyBroken( alternative_service));
alternative_service));
SendRequestAndExpectHttpResponse("hello world"); SendRequestAndExpectHttpResponse("hello world");
SendRequestAndExpectQuicResponse("hello!"); SendRequestAndExpectQuicResponse("hello!");
EXPECT_FALSE( EXPECT_FALSE(http_server_properties_.WasAlternativeServiceRecentlyBroken(
session_->http_server_properties()->WasAlternativeServiceRecentlyBroken( alternative_service));
alternative_service));
} }
TEST_P(QuicNetworkTransactionTest, UseAlternateProtocolProbabilityForQuic) { TEST_P(QuicNetworkTransactionTest, UseAlternateProtocolProbabilityForQuic) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment