| Index: net/spdy/spdy_session_spdy3_unittest.cc
|
| diff --git a/net/spdy/spdy_session_spdy3_unittest.cc b/net/spdy/spdy_session_spdy3_unittest.cc
|
| index 6beeaa66f1dd61549bb4c12cfbcba60bb564cac6..19c9d84704b494f9aa39bdc3c312544b799e0911 100644
|
| --- a/net/spdy/spdy_session_spdy3_unittest.cc
|
| +++ b/net/spdy/spdy_session_spdy3_unittest.cc
|
| @@ -2980,7 +2980,7 @@ void SpdySessionSpdy3Test::RunResumeAfterUnstallTest31(
|
|
|
| stall_fn.Run(session, stream);
|
|
|
| - EXPECT_EQ(ERR_IO_PENDING, delegate.OnSendBody());
|
| + delegate.OnSendBody();
|
|
|
| EXPECT_TRUE(stream->send_stalled_by_flow_control());
|
|
|
| @@ -3157,8 +3157,8 @@ TEST_F(SpdySessionSpdy3Test, ResumeByPriorityAfterSendWindowSizeIncrease31) {
|
|
|
| StallSessionSend(session);
|
|
|
| - EXPECT_EQ(ERR_IO_PENDING, delegate1.OnSendBody());
|
| - EXPECT_EQ(ERR_IO_PENDING, delegate2.OnSendBody());
|
| + delegate1.OnSendBody();
|
| + delegate2.OnSendBody();
|
|
|
| EXPECT_TRUE(stream1->send_stalled_by_flow_control());
|
| EXPECT_TRUE(stream2->send_stalled_by_flow_control());
|
| @@ -3211,13 +3211,12 @@ class StreamClosingDelegate : public test::StreamDelegateWithBody {
|
| stream_to_close_ = stream_to_close;
|
| }
|
|
|
| - virtual int OnSendBody() OVERRIDE {
|
| - int rv = test::StreamDelegateWithBody::OnSendBody();
|
| + virtual void OnSendBody() OVERRIDE {
|
| + test::StreamDelegateWithBody::OnSendBody();
|
| if (stream_to_close_) {
|
| stream_to_close_->Close();
|
| EXPECT_EQ(NULL, stream_to_close_.get());
|
| }
|
| - return rv;
|
| }
|
|
|
| private:
|
| @@ -3343,9 +3342,9 @@ TEST_F(SpdySessionSpdy3Test, SendWindowSizeIncreaseWithDeletedStreams31) {
|
|
|
| StallSessionSend(session);
|
|
|
| - EXPECT_EQ(ERR_IO_PENDING, delegate1.OnSendBody());
|
| - EXPECT_EQ(ERR_IO_PENDING, delegate2.OnSendBody());
|
| - EXPECT_EQ(ERR_IO_PENDING, delegate3.OnSendBody());
|
| + delegate1.OnSendBody();
|
| + delegate2.OnSendBody();
|
| + delegate3.OnSendBody();
|
|
|
| EXPECT_TRUE(stream1->send_stalled_by_flow_control());
|
| EXPECT_TRUE(stream2->send_stalled_by_flow_control());
|
| @@ -3413,8 +3412,8 @@ class SessionClosingDelegate : public test::StreamDelegateWithBody {
|
| session_to_close_ = session_to_close;
|
| }
|
|
|
| - virtual int OnSendBody() OVERRIDE {
|
| - int rv = test::StreamDelegateWithBody::OnSendBody();
|
| + virtual void OnSendBody() OVERRIDE {
|
| + test::StreamDelegateWithBody::OnSendBody();
|
| if (session_to_close_) {
|
| MessageLoop::current()->PostTask(
|
| FROM_HERE,
|
| @@ -3425,7 +3424,6 @@ class SessionClosingDelegate : public test::StreamDelegateWithBody {
|
| "Closed by SessionClosingDelegate"));
|
| session_to_close_ = NULL;
|
| }
|
| - return rv;
|
| }
|
|
|
| private:
|
| @@ -3524,8 +3522,8 @@ TEST_F(SpdySessionSpdy3Test, SendWindowSizeIncreaseWithDeletedSession31) {
|
|
|
| StallSessionSend(session);
|
|
|
| - EXPECT_EQ(ERR_IO_PENDING, delegate1.OnSendBody());
|
| - EXPECT_EQ(ERR_IO_PENDING, delegate2.OnSendBody());
|
| + delegate1.OnSendBody();
|
| + delegate2.OnSendBody();
|
|
|
| EXPECT_TRUE(stream1->send_stalled_by_flow_control());
|
| EXPECT_TRUE(stream2->send_stalled_by_flow_control());
|
|
|