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

Unified Diff: net/spdy/spdy_websocket_stream_spdy3_unittest.cc

Issue 9802003: SPDY - persist SPDY settings. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 9 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_websocket_stream_spdy3_unittest.cc
===================================================================
--- net/spdy/spdy_websocket_stream_spdy3_unittest.cc (revision 127896)
+++ net/spdy/spdy_websocket_stream_spdy3_unittest.cc (working copy)
@@ -198,10 +198,9 @@
host_port_proxy_pair_.second = ProxyServer::Direct();
const size_t max_concurrent_streams = 1;
- spdy::SettingsFlagsAndId id(spdy::SETTINGS_FLAG_PLEASE_PERSIST,
- spdy::SETTINGS_MAX_CONCURRENT_STREAMS);
- spdy_settings_to_set_.push_back(
- spdy::SpdySetting(id, max_concurrent_streams));
+ spdy_settings_id_to_set_ = spdy::SETTINGS_MAX_CONCURRENT_STREAMS;
+ spdy_settings_flags_and_value_to_set_ = std::make_pair(
+ spdy::SETTINGS_FLAG_PLEASE_PERSIST, max_concurrent_streams);
spdy::SettingsFlagsAndId id1(spdy::SETTINGS_FLAG_PERSISTED,
spdy::SETTINGS_MAX_CONCURRENT_STREAMS);
@@ -267,8 +266,10 @@
if (throttling) {
// Set max concurrent streams to 1.
- spdy_session_pool->http_server_properties()->SetSpdySettings(
- host_port_pair_, spdy_settings_to_set_);
+ spdy_session_pool->http_server_properties()->SetSpdySetting(
+ host_port_pair_,
+ spdy_settings_id_to_set_,
+ spdy_settings_flags_and_value_to_set_);
}
EXPECT_FALSE(spdy_session_pool->HasSession(host_port_proxy_pair_));
@@ -295,7 +296,8 @@
websocket_stream_->SendRequest(headers);
}
- spdy::SpdySettings spdy_settings_to_set_;
+ uint32 spdy_settings_id_to_set_;
+ spdy::SettingsFlagsAndValue spdy_settings_flags_and_value_to_set_;
spdy::SpdySettings spdy_settings_to_send_;
SpdySessionDependencies session_deps_;
scoped_ptr<OrderedSocketData> data_;
« net/spdy/spdy_session.cc ('K') | « net/spdy/spdy_websocket_stream_spdy2_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698