| Index: net/quic/quic_connection_test.cc
|
| diff --git a/net/quic/quic_connection_test.cc b/net/quic/quic_connection_test.cc
|
| index dea91866984b1a928eb86a6921a930b9c949fff6..4cbc97b7bdcd03a2fdc493e6c5d3f79c930039d6 100644
|
| --- a/net/quic/quic_connection_test.cc
|
| +++ b/net/quic/quic_connection_test.cc
|
| @@ -9,7 +9,6 @@
|
| #include "base/stl_util.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/quic/congestion_control/loss_detection_interface.h"
|
| -#include "net/quic/congestion_control/receive_algorithm_interface.h"
|
| #include "net/quic/congestion_control/send_algorithm_interface.h"
|
| #include "net/quic/crypto/null_encrypter.h"
|
| #include "net/quic/crypto/quic_decrypter.h"
|
| @@ -64,17 +63,6 @@ const QuicPacketEntropyHash kTestEntropyHash = 76;
|
|
|
| const int kDefaultRetransmissionTimeMs = 500;
|
|
|
| -class TestReceiveAlgorithm : public ReceiveAlgorithmInterface {
|
| - public:
|
| - TestReceiveAlgorithm() {}
|
| -
|
| - MOCK_METHOD3(RecordIncomingPacket,
|
| - void(QuicByteCount, QuicPacketSequenceNumber, QuicTime));
|
| -
|
| - private:
|
| - DISALLOW_COPY_AND_ASSIGN(TestReceiveAlgorithm);
|
| -};
|
| -
|
| // TaggingEncrypter appends kTagSize bytes of |tag| to the end of each message.
|
| class TaggingEncrypter : public QuicEncrypter {
|
| public:
|
| @@ -408,10 +396,6 @@ class TestConnection : public QuicConnection {
|
| QuicConnectionPeer::SendAck(this);
|
| }
|
|
|
| - void SetReceiveAlgorithm(TestReceiveAlgorithm* receive_algorithm) {
|
| - QuicConnectionPeer::SetReceiveAlgorithm(this, receive_algorithm);
|
| - }
|
| -
|
| void SetSendAlgorithm(SendAlgorithmInterface* send_algorithm) {
|
| QuicConnectionPeer::SetSendAlgorithm(this, send_algorithm);
|
| }
|
| @@ -603,7 +587,6 @@ class QuicConnectionTest : public ::testing::TestWithParam<QuicVersion> {
|
| peer_creator_(connection_id_, &framer_, &random_generator_),
|
| send_algorithm_(new StrictMock<MockSendAlgorithm>),
|
| loss_algorithm_(new MockLossAlgorithm()),
|
| - receive_algorithm_(new TestReceiveAlgorithm),
|
| helper_(new TestConnectionHelper(&clock_, &random_generator_)),
|
| writer_(new TestPacketWriter(version(), &clock_)),
|
| factory_(writer_.get()),
|
| @@ -624,12 +607,9 @@ class QuicConnectionTest : public ::testing::TestWithParam<QuicVersion> {
|
| connection_.SetSendAlgorithm(send_algorithm_);
|
| connection_.SetLossAlgorithm(loss_algorithm_);
|
| framer_.set_received_entropy_calculator(&entropy_calculator_);
|
| - connection_.SetReceiveAlgorithm(receive_algorithm_);
|
| EXPECT_CALL(
|
| *send_algorithm_, TimeUntilSend(_, _, _)).WillRepeatedly(Return(
|
| QuicTime::Delta::Zero()));
|
| - EXPECT_CALL(*receive_algorithm_,
|
| - RecordIncomingPacket(_, _, _)).Times(AnyNumber());
|
| EXPECT_CALL(*send_algorithm_, OnPacketSent(_, _, _, _, _))
|
| .Times(AnyNumber());
|
| EXPECT_CALL(*send_algorithm_, RetransmissionDelay()).WillRepeatedly(
|
| @@ -990,7 +970,6 @@ class QuicConnectionTest : public ::testing::TestWithParam<QuicVersion> {
|
|
|
| MockSendAlgorithm* send_algorithm_;
|
| MockLossAlgorithm* loss_algorithm_;
|
| - TestReceiveAlgorithm* receive_algorithm_;
|
| MockClock clock_;
|
| MockRandom random_generator_;
|
| scoped_ptr<TestConnectionHelper> helper_;
|
|
|