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

Unified Diff: net/spdy/spdy_session_unittest.cc

Issue 9419032: Modify the MockConnect constructor to take an enum of ASYNC or SYNC, instead (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix Test Break Created 8 years, 10 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_session_unittest.cc
===================================================================
--- net/spdy/spdy_session_unittest.cc (revision 122403)
+++ net/spdy/spdy_session_unittest.cc (working copy)
@@ -108,7 +108,7 @@
SpdySessionDependencies session_deps;
session_deps.host_resolver->set_synchronous_mode(true);
- MockConnect connect_data(false, OK);
+ MockConnect connect_data(SYNCHRONOUS, OK);
scoped_ptr<spdy::SpdyFrame> goaway(ConstructSpdyGoAway());
MockRead reads[] = {
CreateMockRead(*goaway),
@@ -167,7 +167,7 @@
SpdySessionDependencies session_deps;
session_deps.host_resolver->set_synchronous_mode(true);
- MockConnect connect_data(false, OK);
+ MockConnect connect_data(SYNCHRONOUS, OK);
scoped_ptr<spdy::SpdyFrame> read_ping(ConstructSpdyPing());
MockRead reads[] = {
CreateMockRead(*read_ping),
@@ -258,7 +258,7 @@
SpdySessionDependencies session_deps;
session_deps.host_resolver->set_synchronous_mode(true);
- MockConnect connect_data(false, OK);
+ MockConnect connect_data(SYNCHRONOUS, OK);
scoped_ptr<spdy::SpdyFrame> read_ping(ConstructSpdyPing());
MockRead reads[] = {
CreateMockRead(*read_ping),
@@ -501,7 +501,7 @@
// Set up the socket so we read a SETTINGS frame that raises max concurrent
// streams to 2.
- MockConnect connect_data(false, OK);
+ MockConnect connect_data(SYNCHRONOUS, OK);
scoped_ptr<spdy::SpdyFrame> settings_frame(
ConstructSpdySettings(new_settings));
MockRead reads[] = {
@@ -590,7 +590,7 @@
};
StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0);
- MockConnect connect_data(false, OK);
+ MockConnect connect_data(SYNCHRONOUS, OK);
data.set_connect_data(connect_data);
session_deps.socket_factory->AddSocketDataProvider(&data);
@@ -686,7 +686,7 @@
id.set_id(kBogusSettingId);
id.set_flags(spdy::SETTINGS_FLAG_PERSISTED);
settings.push_back(spdy::SpdySetting(id, kBogusSettingValue));
- MockConnect connect_data(false, OK);
+ MockConnect connect_data(SYNCHRONOUS, OK);
scoped_ptr<spdy::SpdyFrame> settings_frame(
ConstructSpdySettings(settings));
MockWrite writes[] = {
@@ -770,7 +770,7 @@
HostPortPair(test_hosts[i].name, kTestPort), ProxyServer::Direct());
}
- MockConnect connect_data(false, OK);
+ MockConnect connect_data(SYNCHRONOUS, OK);
MockRead reads[] = {
MockRead(false, ERR_IO_PENDING) // Stall forever.
};
@@ -910,7 +910,7 @@
TEST_F(SpdySessionTest, NeedsCredentials) {
SpdySessionDependencies session_deps;
- MockConnect connect_data(false, OK);
+ MockConnect connect_data(SYNCHRONOUS, OK);
MockRead reads[] = {
MockRead(false, ERR_IO_PENDING) // Stall forever.
};
@@ -978,7 +978,7 @@
TEST_F(SpdySessionTest, SendCredentials) {
SpdySessionDependencies session_deps;
- MockConnect connect_data(false, OK);
+ MockConnect connect_data(SYNCHRONOUS, OK);
MockRead reads[] = {
MockRead(false, ERR_IO_PENDING) // Stall forever.
};

Powered by Google App Engine
This is Rietveld 408576698