summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorrch <rch@chromium.org>2015-04-09 18:15:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-10 01:15:54 +0000
commitebf1298663e6370e12f53db14f4acb0806e5b31b (patch)
tree7b0c4bcd6583060a2a706471df2d97b4544964f4 /jingle
parent920edd62972705901131aeca3bb937dcb0fd51f7 (diff)
downloadchromium_src-ebf1298663e6370e12f53db14f4acb0806e5b31b.zip
chromium_src-ebf1298663e6370e12f53db14f4acb0806e5b31b.tar.gz
chromium_src-ebf1298663e6370e12f53db14f4acb0806e5b31b.tar.bz2
Remove force_spdy_always, force_spdy_over_ssl and force_spdy_single_domain.
This required a major overhaul of SpdyNetworkTransactionTests because it was forcing SPDY in one of its modes of operation. This is terrile, because it turns out to never have been testing the "normal" mode of operations in which SPDY support was discovered in the course of the TLS handshake for an HTTPS URL. *ouch* Add a default_url_ member to SpdyTestUtil to simplify tests which do both http:// and https:// requests. Review URL: https://codereview.chromium.org/1075623002 Cr-Commit-Position: refs/heads/master@{#324562}
Diffstat (limited to 'jingle')
-rw-r--r--jingle/glue/proxy_resolving_client_socket.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc
index cc93710..5a6e068 100644
--- a/jingle/glue/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc
@@ -84,8 +84,6 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(
reference_params->testing_fixed_https_port;
session_params.next_protos = reference_params->next_protos;
session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy;
- session_params.force_spdy_over_ssl = reference_params->force_spdy_over_ssl;
- session_params.force_spdy_always = reference_params->force_spdy_always;
session_params.forced_spdy_exclusions =
reference_params->forced_spdy_exclusions;
session_params.use_alternate_protocols =