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

Unified Diff: net/spdy/spdy_websocket_stream_spdy2_unittest.cc

Issue 9618002: SPDY - integration of spdy/3 code. (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
« no previous file with comments | « net/spdy/spdy_stream_spdy3_unittest.cc ('k') | net/spdy/spdy_websocket_stream_spdy3_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_websocket_stream_spdy2_unittest.cc
===================================================================
--- net/spdy/spdy_websocket_stream_spdy2_unittest.cc (revision 126086)
+++ net/spdy/spdy_websocket_stream_spdy2_unittest.cc (working copy)
@@ -11,6 +11,7 @@
#include "base/bind_helpers.h"
#include "net/base/completion_callback.h"
#include "net/proxy/proxy_server.h"
+#include "net/socket/ssl_client_socket.h"
#include "net/spdy/spdy_http_utils.h"
#include "net/spdy/spdy_protocol.h"
#include "net/spdy/spdy_session.h"
@@ -189,6 +190,7 @@
virtual void SetUp() {
EnableCompression(false);
+ SpdySession::set_default_protocol(SSLClientSocket::kProtoSPDY2);
SpdySession::SetSSLMode(false);
host_port_pair_.set_host("example.com");
@@ -197,17 +199,17 @@
host_port_proxy_pair_.second = ProxyServer::Direct();
const size_t max_concurrent_streams = 1;
- spdy::SettingsFlagsAndId id(0);
- id.set_id(spdy::SETTINGS_MAX_CONCURRENT_STREAMS);
-
- id.set_flags(spdy::SETTINGS_FLAG_PLEASE_PERSIST);
+ 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));
- id.set_flags(spdy::SETTINGS_FLAG_PERSISTED);
+ spdy::SettingsFlagsAndId id1(spdy::SETTINGS_FLAG_PERSISTED,
+ spdy::SETTINGS_MAX_CONCURRENT_STREAMS);
spdy_settings_to_send_.push_back(
- spdy::SpdySetting(id, max_concurrent_streams));
+ spdy::SpdySetting(id1, max_concurrent_streams));
}
+
virtual void TearDown() {
MessageLoop::current()->RunAllPending();
}
« no previous file with comments | « net/spdy/spdy_stream_spdy3_unittest.cc ('k') | net/spdy/spdy_websocket_stream_spdy3_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698