Use ConnectionErrorObserver, not callbacks, for error handling.

blimp/net/blimp_connection_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/net/blimp_connection.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 28 matching lines @@
     connection_.reset(new BlimpConnection(
         base::WrapUnique(new MockPacketReader), std::move(writer)));
     connection_->AddConnectionErrorObserver(&error_observer1_);
     connection_->AddConnectionErrorObserver(&error_observer2_);
     connection_->AddConnectionErrorObserver(&error_observer3_);
     connection_->RemoveConnectionErrorObserver(&error_observer3_);
   }
 
   ~BlimpConnectionTest() override {}
 
+  void DropConnection() { connection_.reset(); }
+
  protected:
   std::unique_ptr<BlimpMessage> CreateInputMessage() {
     std::unique_ptr<BlimpMessage> msg(new BlimpMessage);
     msg->set_type(BlimpMessage::INPUT);
     return msg;
   }
 
   std::unique_ptr<BlimpMessage> CreateControlMessage() {
     std::unique_ptr<BlimpMessage> msg(new BlimpMessage);
     msg->set_type(BlimpMessage::TAB_CONTROL);
@@ skipping 53 matching lines @@
   InSequence s;
   EXPECT_CALL(*writer_,
               WritePacket(BufferEqualsProto(*CreateInputMessage()), _))
       .WillOnce(SaveArg<1>(&write_packet_cb))
       .RetiresOnSaturation();
   EXPECT_CALL(*writer_,
               WritePacket(BufferEqualsProto(*CreateControlMessage()), _))
       .WillOnce(SaveArg<1>(&write_packet_cb))
       .RetiresOnSaturation();
   EXPECT_CALL(error_observer1_, OnConnectionError(net::ERR_FAILED));
-  EXPECT_CALL(error_observer2_, OnConnectionError(net::ERR_FAILED));
+  EXPECT_CALL(error_observer2_, OnConnectionError(net::ERR_FAILED))
+      .WillOnce(testing::InvokeWithoutArgs(
+          this, &BlimpConnectionTest::DropConnection));

[Wez, 2016/05/25 03:28:35]

You don't want to add a separate, dedicated test?

[Kevin M, 2016/05/25 20:40:25]

Done.

 
   BlimpMessageProcessor* sender = connection_->GetOutgoingMessageProcessor();
   net::TestCompletionCallback complete_cb_1;
   sender->ProcessMessage(CreateInputMessage(),
                          complete_cb_1.callback());
   base::ResetAndReturn(&write_packet_cb).Run(net::OK);
   EXPECT_EQ(net::OK, complete_cb_1.WaitForResult());
 
   net::TestCompletionCallback complete_cb_2;
   sender->ProcessMessage(CreateControlMessage(),
                          complete_cb_2.callback());
   base::ResetAndReturn(&write_packet_cb).Run(net::ERR_FAILED);
   EXPECT_EQ(net::ERR_FAILED, complete_cb_2.WaitForResult());
 }
 
 }  // namespace
 }  // namespace blimp