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

Unified Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc

Issue 1094553002: Revert "Speculative revert by sheriff" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
Download patch
Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc
index 0b404ad1ad27049d03180ce8aca4813c9acd2be0..1d64a4cb9a732fd96c7dac5ff3cf7b9aced75387 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc
@@ -194,6 +194,18 @@ TEST(DataReductionProxySettingsStandaloneTest, TestEndToEndSecureProxyCheck) {
.SkipSettingsInitialization()
.Build();
+ // Enabling QUIC should have no effect since secure proxy should not
+ // use QUIC. If secure proxy check incorrectly uses QUIC, the tests will
+ // fail because Mock sockets do not speak QUIC.
+ scoped_ptr<net::HttpNetworkSession::Params> params(
+ new net::HttpNetworkSession::Params());
+ params->use_alternate_protocols = true;
+ params->enable_quic = true;
+ params->origin_to_force_quic_on = net::HostPortPair::FromString(
+ TestDataReductionProxyParams::DefaultSecureProxyCheckURL());
+
+ context.set_http_network_session_params(params.Pass());
+
context.set_net_log(drp_test_context->net_log());
net::MockClientSocketFactory mock_socket_factory;
context.set_client_socket_factory(&mock_socket_factory);

Powered by Google App Engine
This is Rietveld 408576698