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

Unified Diff: net/spdy/spdy_test_util_common.h

Issue 295383007: Get rid of websocket_over_spdy_enabled global. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge Created 6 years, 7 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: net/spdy/spdy_test_util_common.h
diff --git a/net/spdy/spdy_test_util_common.h b/net/spdy/spdy_test_util_common.h
index bbecf14e1eab01287b1e851303952756b5d5d444..630e289e66d6735d044da13f8b00cb7609ac5a44 100644
--- a/net/spdy/spdy_test_util_common.h
+++ b/net/spdy/spdy_test_util_common.h
@@ -218,11 +218,12 @@ struct SpdySessionDependencies {
NextProto protocol;
size_t stream_initial_recv_window_size;
SpdySession::TimeFunc time_func;
- NextProtoVector next_protos;
+ NextProtoVector next_protos;
std::string trusted_spdy_proxy;
- bool force_spdy_over_ssl;
- bool force_spdy_always;
+ bool force_spdy_over_ssl;
+ bool force_spdy_always;
bool use_alternate_protocols;
+ bool enable_websocket_over_spdy;
NetLog* net_log;
};

Powered by Google App Engine
This is Rietveld 408576698