summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_network_transaction_unittest.cc
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-17 21:02:36 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-17 21:02:36 +0000
commitd973e99aa66ee6a8867ecb076bec8bdda7445e14 (patch)
tree309364d47ac5680ce500f787d7faeb9dfb188a56 /net/spdy/spdy_network_transaction_unittest.cc
parent269695f82b5352b8684ea0abcb183e859a362d95 (diff)
downloadchromium_src-d973e99aa66ee6a8867ecb076bec8bdda7445e14.zip
chromium_src-d973e99aa66ee6a8867ecb076bec8bdda7445e14.tar.gz
chromium_src-d973e99aa66ee6a8867ecb076bec8bdda7445e14.tar.bz2
Modify the MockConnect constructor to take an enum of ASYNC or SYNCHRONOUS,
instead of a boolean async. Review URL: http://codereview.chromium.org/9419032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_network_transaction_unittest.cc')
-rw-r--r--net/spdy/spdy_network_transaction_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index e750208..bf00bf4 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -243,7 +243,7 @@ class SpdyNetworkTransactionTest
session_deps_->socket_factory->AddSSLSocketDataProvider(ssl_.get());
session_deps_->socket_factory->AddSocketDataProvider(data);
if (test_type_ == SPDYNPN) {
- MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+ MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
linked_ptr<StaticSocketDataProvider>
hanging_non_alternate_protocol_socket(
new StaticSocketDataProvider(NULL, 0, NULL, 0));
@@ -273,7 +273,7 @@ class SpdyNetworkTransactionTest
}
session_deps_->deterministic_socket_factory->AddSocketDataProvider(data);
if (test_type_ == SPDYNPN) {
- MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+ MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
scoped_refptr<DeterministicSocketData>
hanging_non_alternate_protocol_socket(
new DeterministicSocketData(NULL, 0, NULL, 0));
@@ -758,7 +758,7 @@ TEST_P(SpdyNetworkTransactionTest, TwoGetsLateBinding) {
new OrderedSocketData(reads, arraysize(reads),
writes, arraysize(writes)));
- MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+ MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
scoped_ptr<OrderedSocketData> data_placeholder(
new OrderedSocketData(NULL, 0, NULL, 0));
@@ -845,7 +845,7 @@ TEST_P(SpdyNetworkTransactionTest, TwoGetsLateBindingFromPreconnect) {
new OrderedSocketData(reads, arraysize(reads),
writes, arraysize(writes)));
- MockConnect never_finishing_connect(true, ERR_IO_PENDING);
+ MockConnect never_finishing_connect(ASYNC, ERR_IO_PENDING);
scoped_ptr<OrderedSocketData> data_placeholder(
new OrderedSocketData(NULL, 0, NULL, 0));