Make PacketReader/PacketWriter interfaces async-only.

blimp/net/blimp_connection_unittest.cc

Index: blimp/net/blimp_connection_unittest.cc
diff --git a/blimp/net/blimp_connection_unittest.cc b/blimp/net/blimp_connection_unittest.cc
index 82a547b36fee6d5f5d883eed4042d564dc1a43ac..c5c14d9ab5c8cc0c202cd7fec0da16dc1e3b369f 100644
--- a/blimp/net/blimp_connection_unittest.cc
+++ b/blimp/net/blimp_connection_unittest.cc
@@ -20,7 +20,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
-using testing::DoAll;
 using testing::InSequence;
 using testing::NotNull;
 using testing::Return;
@@ -70,79 +69,16 @@ class BlimpConnectionTest : public testing::Test {
   scoped_ptr<BlimpConnection> connection_;
 };
 
-// Reader completes reading one packet synchronously.
-// Two read cases here. BlimpMessagePumpTest covers other cases.
-TEST_F(BlimpConnectionTest, SyncPacketRead) {
-  EXPECT_CALL(receiver_, MockableProcessMessage(EqualsProto(*message1_), _));
-  EXPECT_CALL(*reader_, ReadPacket(NotNull(), _))
-      .WillOnce(DoAll(FillBufferFromMessage<0>(message1_.get()),
-                      Return(message1_->ByteSize())));
-  connection_->SetIncomingMessageProcessor(&receiver_);
-}
-
-// Reader completes reading one packet synchronously withe error.
-TEST_F(BlimpConnectionTest, SyncPacketReadWithError) {
-  InSequence s;
-  EXPECT_CALL(*reader_, ReadPacket(NotNull(), _))
-      .WillOnce(Return(net::ERR_FAILED));
-  EXPECT_CALL(error_observer_, OnConnectionError(net::ERR_FAILED));
-  connection_->SetIncomingMessageProcessor(&receiver_);
-}
-
-// Writer completes writing two packets synchronously.
-TEST_F(BlimpConnectionTest, SyncTwoPacketsWrite) {
-  InSequence s;
-  EXPECT_CALL(*writer_, WritePacket(BufferEqualsProto(*message1_), _))
-      .WillOnce(Return(net::OK))
-      .RetiresOnSaturation();
-  EXPECT_CALL(*writer_, WritePacket(BufferEqualsProto(*message2_), _))
-      .WillOnce(Return(net::OK))
-      .RetiresOnSaturation();
-
-  BlimpMessageProcessor* sender = connection_->GetOutgoingMessageProcessor();
-  net::TestCompletionCallback complete_cb_1;
-  sender->ProcessMessage(CreateInputMessage().Pass(), complete_cb_1.callback());
-  EXPECT_EQ(net::OK, complete_cb_1.WaitForResult());
-  net::TestCompletionCallback complete_cb_2;
-  sender->ProcessMessage(CreateControlMessage().Pass(),
-                         complete_cb_2.callback());
-  EXPECT_EQ(net::OK, complete_cb_2.WaitForResult());
-}
-
-// Writer completes writing two packets synchronously.
-// First write succeeds, second fails.
-TEST_F(BlimpConnectionTest, SyncTwoPacketsWriteWithError) {
-  InSequence s;
-  EXPECT_CALL(*writer_, WritePacket(BufferEqualsProto(*message1_), _))
-      .WillOnce(Return(net::OK))
-      .RetiresOnSaturation();
-  EXPECT_CALL(*writer_, WritePacket(BufferEqualsProto(*message2_), _))
-      .WillOnce(Return(net::ERR_FAILED))
-      .RetiresOnSaturation();
-  EXPECT_CALL(error_observer_, OnConnectionError(net::ERR_FAILED));
-
-  BlimpMessageProcessor* sender = connection_->GetOutgoingMessageProcessor();
-  net::TestCompletionCallback complete_cb_1;
-  sender->ProcessMessage(CreateInputMessage().Pass(), complete_cb_1.callback());
-  EXPECT_EQ(net::OK, complete_cb_1.WaitForResult());
-  net::TestCompletionCallback complete_cb_2;
-  sender->ProcessMessage(CreateControlMessage().Pass(),
-                         complete_cb_2.callback());
-  EXPECT_EQ(net::ERR_FAILED, complete_cb_2.WaitForResult());
-}
-
 // Write completes writing two packets asynchronously.
 TEST_F(BlimpConnectionTest, AsyncTwoPacketsWrite) {
   net::CompletionCallback write_packet_cb;
 
   InSequence s;
   EXPECT_CALL(*writer_, WritePacket(BufferEqualsProto(*message1_), _))
-      .WillOnce(
-          DoAll(SaveArg<1>(&write_packet_cb), Return(net::ERR_IO_PENDING)))
+      .WillOnce(SaveArg<1>(&write_packet_cb))
       .RetiresOnSaturation();
   EXPECT_CALL(*writer_, WritePacket(BufferEqualsProto(*message2_), _))
-      .WillOnce(
-          DoAll(SaveArg<1>(&write_packet_cb), Return(net::ERR_IO_PENDING)))
+      .WillOnce(SaveArg<1>(&write_packet_cb))
       .RetiresOnSaturation();
 
   BlimpMessageProcessor* sender = connection_->GetOutgoingMessageProcessor();
@@ -169,12 +105,10 @@ TEST_F(BlimpConnectionTest, AsyncTwoPacketsWriteWithError) {
 
   InSequence s;
   EXPECT_CALL(*writer_, WritePacket(BufferEqualsProto(*message1_), _))
-      .WillOnce(
-          DoAll(SaveArg<1>(&write_packet_cb), Return(net::ERR_IO_PENDING)))
+      .WillOnce(SaveArg<1>(&write_packet_cb))
       .RetiresOnSaturation();
   EXPECT_CALL(*writer_, WritePacket(BufferEqualsProto(*message2_), _))
-      .WillOnce(
-          DoAll(SaveArg<1>(&write_packet_cb), Return(net::ERR_IO_PENDING)))
+      .WillOnce(SaveArg<1>(&write_packet_cb))
       .RetiresOnSaturation();
   EXPECT_CALL(error_observer_, OnConnectionError(net::ERR_FAILED));