Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1448)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 2089243002: Split enable_alternative_service_with_different_host flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
Download patch
« components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc ('K') | « net/http/http_network_session.cc ('k') | net/http/http_stream_factory_impl_job_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction_unittest.cc
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
index f1a3a2d733107727ba4edef0d645204e14334c2a..620b89fbd9ad6177361c4df9558403b4388ea4c4 100644
--- a/net/http/http_network_transaction_unittest.cc
+++ b/net/http/http_network_transaction_unittest.cc
@@ -9159,8 +9159,6 @@ TEST_P(HttpNetworkTransactionTest, GroupNameForDirectConnections) {
},
};
- session_deps_.enable_alternative_service_with_different_host = false;
-
for (size_t i = 0; i < arraysize(tests); ++i) {
session_deps_.proxy_service =
ProxyService::CreateFixed(tests[i].proxy_server);
@@ -9221,8 +9219,6 @@ TEST_P(HttpNetworkTransactionTest, GroupNameForHTTPProxyConnections) {
},
};
- session_deps_.enable_alternative_service_with_different_host = false;
-
for (size_t i = 0; i < arraysize(tests); ++i) {
session_deps_.proxy_service =
ProxyService::CreateFixed(tests[i].proxy_server);
@@ -9291,8 +9287,6 @@ TEST_P(HttpNetworkTransactionTest, GroupNameForSOCKSConnections) {
},
};
- session_deps_.enable_alternative_service_with_different_host = false;
-
for (size_t i = 0; i < arraysize(tests); ++i) {
session_deps_.proxy_service =
ProxyService::CreateFixed(tests[i].proxy_server);
@@ -9952,8 +9946,6 @@ TEST_P(HttpNetworkTransactionTest, ChangeAuthRealms) {
}
TEST_P(HttpNetworkTransactionTest, HonorAlternativeServiceHeader) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
std::string alternative_service_http_header =
GetAlternativeServiceHttpHeader();
@@ -10074,8 +10066,6 @@ TEST_P(HttpNetworkTransactionTest,
// TODO(bnc): Remove when https://crbug.com/615413 is fixed.
TEST_P(HttpNetworkTransactionTest,
DisableHTTP2AlternativeServicesWithDifferentHost) {
- session_deps_.enable_alternative_service_with_different_host = true;
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.example.org/");
@@ -10158,8 +10148,6 @@ TEST_P(HttpNetworkTransactionTest,
}
TEST_P(HttpNetworkTransactionTest, ClearAlternativeServices) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
// Set an alternative service for origin.
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpServerProperties* http_server_properties =
@@ -10214,8 +10202,6 @@ TEST_P(HttpNetworkTransactionTest, ClearAlternativeServices) {
}
TEST_P(HttpNetworkTransactionTest, HonorMultipleAlternativeServiceHeader) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Alt-Svc: "),
@@ -10278,10 +10264,10 @@ TEST_P(HttpNetworkTransactionTest, HonorMultipleAlternativeServiceHeader) {
EXPECT_EQ(1234, alternative_service_vector[1].port);
}
-// When |enable_alternative_service_with_different_host| is false, do not
+// When |enable_http2_alternative_service_with_different_host| is false, do not
// observe alternative service entries that point to a different host.
TEST_P(HttpNetworkTransactionTest, DisableAlternativeServiceToDifferentHost) {
- session_deps_.enable_alternative_service_with_different_host = false;
+ session_deps_.enable_http2_alternative_service_with_different_host = false;
HttpRequestInfo request;
request.method = "GET";
@@ -10356,7 +10342,6 @@ TEST_P(HttpNetworkTransactionTest, IdentifyQuicBroken) {
session_deps_.socket_factory->AddSocketDataProvider(&data_refused);
// Set up a QUIC alternative service for server.
- session_deps_.enable_alternative_service_with_different_host = false;
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpServerProperties* http_server_properties =
session->http_server_properties();
@@ -10416,7 +10401,6 @@ TEST_P(HttpNetworkTransactionTest, IdentifyQuicNotBroken) {
data_refused.set_connect_data(MockConnect(ASYNC, ERR_CONNECTION_REFUSED));
session_deps_.socket_factory->AddSocketDataProvider(&data_refused);
- session_deps_.enable_alternative_service_with_different_host = true;
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpServerProperties* http_server_properties =
session->http_server_properties();
@@ -10460,8 +10444,6 @@ TEST_P(HttpNetworkTransactionTest, IdentifyQuicNotBroken) {
TEST_P(HttpNetworkTransactionTest,
MarkBrokenAlternateProtocolAndFallback) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.example.org/");
@@ -10526,8 +10508,6 @@ TEST_P(HttpNetworkTransactionTest,
// cases.
TEST_P(HttpNetworkTransactionTest,
AlternateProtocolPortRestrictedBlocked) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
HttpRequestInfo restricted_port_request;
restricted_port_request.method = "GET";
restricted_port_request.url = GURL("http://www.example.org:1023/");
@@ -10577,7 +10557,6 @@ TEST_P(HttpNetworkTransactionTest,
// port (port < 1024) if we set |enable_user_alternate_protocol_ports|.
TEST_P(HttpNetworkTransactionTest,
AlternateProtocolPortRestrictedPermitted) {
- session_deps_.enable_alternative_service_with_different_host = false;
session_deps_.enable_user_alternate_protocol_ports = true;
HttpRequestInfo restricted_port_request;
@@ -10629,8 +10608,6 @@ TEST_P(HttpNetworkTransactionTest,
// cases.
TEST_P(HttpNetworkTransactionTest,
AlternateProtocolPortRestrictedAllowed) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
HttpRequestInfo restricted_port_request;
restricted_port_request.method = "GET";
restricted_port_request.url = GURL("http://www.example.org:1023/");
@@ -10681,8 +10658,6 @@ TEST_P(HttpNetworkTransactionTest,
// cases.
TEST_P(HttpNetworkTransactionTest,
AlternateProtocolPortUnrestrictedAllowed1) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
HttpRequestInfo unrestricted_port_request;
unrestricted_port_request.method = "GET";
unrestricted_port_request.url = GURL("http://www.example.org:1024/");
@@ -10732,8 +10707,6 @@ TEST_P(HttpNetworkTransactionTest,
// cases.
TEST_P(HttpNetworkTransactionTest,
AlternateProtocolPortUnrestrictedAllowed2) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
HttpRequestInfo unrestricted_port_request;
unrestricted_port_request.method = "GET";
unrestricted_port_request.url = GURL("http://www.example.org:1024/");
@@ -10781,8 +10754,6 @@ TEST_P(HttpNetworkTransactionTest,
// to an unsafe port, and that we resume the second HttpStreamFactoryImpl::Job
// once the alternate protocol request fails.
TEST_P(HttpNetworkTransactionTest, AlternateProtocolUnsafeBlocked) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.example.org/");
@@ -10831,8 +10802,6 @@ TEST_P(HttpNetworkTransactionTest, AlternateProtocolUnsafeBlocked) {
}
TEST_P(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) {
- session_deps_.enable_alternative_service_with_different_host = true;
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.example.org/");
@@ -10920,8 +10889,6 @@ TEST_P(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) {
}
TEST_P(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) {
- session_deps_.enable_alternative_service_with_different_host = true;
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.example.org/");
@@ -11044,8 +11011,6 @@ TEST_P(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) {
}
TEST_P(HttpNetworkTransactionTest, StallAlternativeServiceForNpnSpdy) {
- session_deps_.enable_alternative_service_with_different_host = true;
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.example.org/");
@@ -11171,8 +11136,6 @@ class CapturingProxyResolverFactory : public ProxyResolverFactory {
};
TEST_P(HttpNetworkTransactionTest, UseAlternativeServiceForTunneledNpnSpdy) {
- session_deps_.enable_alternative_service_with_different_host = true;
-
ProxyConfig proxy_config;
proxy_config.set_auto_detect(true);
proxy_config.set_pac_url(GURL("http://fooproxyurl"));
@@ -11296,8 +11259,6 @@ TEST_P(HttpNetworkTransactionTest, UseAlternativeServiceForTunneledNpnSpdy) {
TEST_P(HttpNetworkTransactionTest,
UseAlternativeServiceForNpnSpdyWithExistingSpdySession) {
- session_deps_.enable_alternative_service_with_different_host = true;
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("http://www.example.org/");
@@ -11998,8 +11959,6 @@ TEST_P(HttpNetworkTransactionTest, MultiRoundAuth) {
// This tests the case that a request is issued via http instead of spdy after
// npn is negotiated.
TEST_P(HttpNetworkTransactionTest, NpnWithHttpOverSSL) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("https://www.example.org/");
@@ -12060,8 +12019,6 @@ TEST_P(HttpNetworkTransactionTest, NpnWithHttpOverSSL) {
// immediate server closing of the socket.
// Regression test for https://crbug.com/46369.
TEST_P(HttpNetworkTransactionTest, SpdyPostNPNServerHangup) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
HttpRequestInfo request;
request.method = "GET";
request.url = GURL("https://www.example.org/");
@@ -12120,8 +12077,6 @@ class UrlRecordingHttpAuthHandlerMock : public HttpAuthHandlerMock {
// This test ensures that the URL passed into the proxy is upgraded to https
// when doing an Alternate Protocol upgrade.
TEST_P(HttpNetworkTransactionTest, SpdyAlternativeServiceThroughProxy) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
session_deps_.proxy_service =
ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
TestNetLog net_log;
@@ -13060,8 +13015,6 @@ TEST_P(HttpNetworkTransactionTest, ClientAuthCertCache_Proxy_Fail) {
}
TEST_P(HttpNetworkTransactionTest, UseIPConnectionPooling) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
// Set up a special HttpNetworkSession with a MockCachingHostResolver.
session_deps_.host_resolver.reset(new MockCachingHostResolver());
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -13157,8 +13110,6 @@ TEST_P(HttpNetworkTransactionTest, UseIPConnectionPooling) {
}
TEST_P(HttpNetworkTransactionTest, UseIPConnectionPoolingAfterResolution) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
// Set up a special HttpNetworkSession with a MockCachingHostResolver.
session_deps_.host_resolver.reset(new MockCachingHostResolver());
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ -13282,8 +13233,6 @@ class OneTimeCachingHostResolver : public HostResolver {
TEST_P(HttpNetworkTransactionTest,
UseIPConnectionPoolingWithHostCacheExpiration) {
- session_deps_.enable_alternative_service_with_different_host = false;
-
// Set up a special HttpNetworkSession with a OneTimeCachingHostResolver.
OneTimeCachingHostResolver host_resolver(HostPortPair("www.gmail.com", 443));
HttpNetworkSession::Params params =
@@ -13539,7 +13488,6 @@ class AltSvcCertificateVerificationTest : public HttpNetworkTransactionTest {
data_refused.set_connect_data(mock_connect);
session_deps_.socket_factory->AddSocketDataProvider(&data_refused);
- session_deps_.enable_alternative_service_with_different_host = true;
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpServerProperties* http_server_properties =
session->http_server_properties();
@@ -13644,7 +13592,6 @@ TEST_P(HttpNetworkTransactionTest, AlternativeServiceNotOnHttp11) {
session_deps_.socket_factory->AddSocketDataProvider(&data_refused);
// Set up alternative service for server.
- session_deps_.enable_alternative_service_with_different_host = true;
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpServerProperties* http_server_properties =
session->http_server_properties();
@@ -13715,7 +13662,6 @@ TEST_P(HttpNetworkTransactionTest, FailedAlternativeServiceIsNotUserVisible) {
session_deps_.socket_factory->AddSocketDataProvider(&http_data);
// Set up alternative service for server.
- session_deps_.enable_alternative_service_with_different_host = true;
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpServerProperties* http_server_properties =
session->http_server_properties();
@@ -13824,7 +13770,6 @@ TEST_P(HttpNetworkTransactionTest, AlternativeServiceShouldNotPoolToHttp11) {
session_deps_.socket_factory->AddSocketDataProvider(&data_refused);
// Set up alternative service for server.
- session_deps_.enable_alternative_service_with_different_host = false;
std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
HttpServerProperties* http_server_properties =
session->http_server_properties();
« components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data_unittest.cc ('K') | « net/http/http_network_session.cc ('k') | net/http/http_stream_factory_impl_job_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698