Index: net/spdy/spdy_test_util_common.cc |
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc |
index e73878cbf7a47f4a37ba6bfcba6b174764026a08..a2a2e8fc0ffa7d5bca535f3c4b7f49a8731f86f6 100644 |
--- a/net/spdy/spdy_test_util_common.cc |
+++ b/net/spdy/spdy_test_util_common.cc |
@@ -357,9 +357,10 @@ SpdySessionDependencies::SpdySessionDependencies(NextProto protocol) |
protocol(protocol), |
stream_initial_recv_window_size(kSpdyStreamInitialWindowSize), |
time_func(&base::TimeTicks::Now), |
- force_spdy_over_ssl(false), |
- force_spdy_always(false), |
+ force_spdy_over_ssl(false), |
+ force_spdy_always(false), |
use_alternate_protocols(false), |
+ enable_websocket_over_spdy(false), |
net_log(NULL) { |
DCHECK(next_proto_is_spdy(protocol)) << "Invalid protocol: " << protocol; |
@@ -390,9 +391,10 @@ SpdySessionDependencies::SpdySessionDependencies( |
protocol(protocol), |
stream_initial_recv_window_size(kSpdyStreamInitialWindowSize), |
time_func(&base::TimeTicks::Now), |
- force_spdy_over_ssl(false), |
- force_spdy_always(false), |
+ force_spdy_over_ssl(false), |
+ force_spdy_always(false), |
use_alternate_protocols(false), |
+ enable_websocket_over_spdy(false), |
net_log(NULL) { |
DCHECK(next_proto_is_spdy(protocol)) << "Invalid protocol: " << protocol; |
} |
@@ -452,6 +454,7 @@ net::HttpNetworkSession::Params SpdySessionDependencies::CreateSessionParams( |
params.force_spdy_over_ssl = session_deps->force_spdy_over_ssl; |
params.force_spdy_always = session_deps->force_spdy_always; |
params.use_alternate_protocols = session_deps->use_alternate_protocols; |
+ params.enable_websocket_over_spdy = session_deps->enable_websocket_over_spdy; |
params.net_log = session_deps->net_log; |
return params; |
} |