| Index: net/http/http_network_transaction_spdy2_unittest.cc
|
| diff --git a/net/http/http_network_transaction_spdy2_unittest.cc b/net/http/http_network_transaction_spdy2_unittest.cc
|
| index 54f1a43bd746bb3452d94e0e2cb8b10e2bf57c5a..5af035f6516835da9ce8ee6f7ca13a75cc5fb85b 100644
|
| --- a/net/http/http_network_transaction_spdy2_unittest.cc
|
| +++ b/net/http/http_network_transaction_spdy2_unittest.cc
|
| @@ -309,10 +309,10 @@ class HttpNetworkTransactionSpdy2Test : public PlatformTest {
|
| TestCompletionCallback callback;
|
|
|
| EXPECT_TRUE(log.bound().IsLoggingAllEvents());
|
| - int rv = trans->Start(&request, callback.callback(), log.bound());
|
| - EXPECT_EQ(ERR_IO_PENDING, rv);
|
| -
|
| - out.rv = callback.WaitForResult();
|
| + out.rv = trans->Start(&request, callback.callback(), log.bound());
|
| + EXPECT_EQ(ERR_IO_PENDING, out.rv);
|
| + if (out.rv == net::ERR_IO_PENDING)
|
| + out.rv = callback.WaitForResult();
|
|
|
| // Even in the failure cases that use this function, connections are always
|
| // successfully established before the error.
|
| @@ -334,7 +334,7 @@ class HttpNetworkTransactionSpdy2Test : public PlatformTest {
|
| EXPECT_EQ("127.0.0.1", response->socket_address.host());
|
| EXPECT_EQ(80, response->socket_address.port());
|
|
|
| - rv = ReadTransaction(trans.get(), &out.response_data);
|
| + int rv = ReadTransaction(trans.get(), &out.response_data);
|
| EXPECT_EQ(OK, rv);
|
|
|
| net::CapturingNetLog::CapturedEntryList entries;
|
|
|