| Index: net/tools/quic/quic_dispatcher_test.cc
|
| diff --git a/net/tools/quic/quic_dispatcher_test.cc b/net/tools/quic/quic_dispatcher_test.cc
|
| index 4666fe64452ebe3ea3b4e67d1960f50e22b30eda..5e4726ff316478eef79888f83cba33f58fd38533 100644
|
| --- a/net/tools/quic/quic_dispatcher_test.cc
|
| +++ b/net/tools/quic/quic_dispatcher_test.cc
|
| @@ -297,7 +297,7 @@ class BlockingWriter : public QuicPacketWriterWrapper {
|
| bool write_blocked_;
|
| };
|
|
|
| -class QuicWriteBlockedListTest : public QuicDispatcherTest {
|
| +class QuicDispatcherWriteBlockedListTest : public QuicDispatcherTest {
|
| public:
|
| virtual void SetUp() {
|
| writer_ = new BlockingWriter;
|
| @@ -334,7 +334,7 @@ class QuicWriteBlockedListTest : public QuicDispatcherTest {
|
| QuicDispatcher::WriteBlockedList* blocked_list_;
|
| };
|
|
|
| -TEST_F(QuicWriteBlockedListTest, BasicOnCanWrite) {
|
| +TEST_F(QuicDispatcherWriteBlockedListTest, BasicOnCanWrite) {
|
| // No OnCanWrite calls because no connections are blocked.
|
| dispatcher_.OnCanWrite();
|
|
|
| @@ -349,7 +349,7 @@ TEST_F(QuicWriteBlockedListTest, BasicOnCanWrite) {
|
| EXPECT_FALSE(dispatcher_.OnCanWrite());
|
| }
|
|
|
| -TEST_F(QuicWriteBlockedListTest, OnCanWriteOrder) {
|
| +TEST_F(QuicDispatcherWriteBlockedListTest, OnCanWriteOrder) {
|
| // Make sure we handle events in order.
|
| InSequence s;
|
| SetBlocked();
|
| @@ -368,7 +368,7 @@ TEST_F(QuicWriteBlockedListTest, OnCanWriteOrder) {
|
| dispatcher_.OnCanWrite();
|
| }
|
|
|
| -TEST_F(QuicWriteBlockedListTest, OnCanWriteRemove) {
|
| +TEST_F(QuicDispatcherWriteBlockedListTest, OnCanWriteRemove) {
|
| // Add and remove one connction.
|
| SetBlocked();
|
| dispatcher_.OnWriteBlocked(connection1());
|
| @@ -393,7 +393,7 @@ TEST_F(QuicWriteBlockedListTest, OnCanWriteRemove) {
|
| dispatcher_.OnCanWrite();
|
| }
|
|
|
| -TEST_F(QuicWriteBlockedListTest, DoubleAdd) {
|
| +TEST_F(QuicDispatcherWriteBlockedListTest, DoubleAdd) {
|
| // Make sure a double add does not necessitate a double remove.
|
| SetBlocked();
|
| dispatcher_.OnWriteBlocked(connection1());
|
| @@ -410,14 +410,14 @@ TEST_F(QuicWriteBlockedListTest, DoubleAdd) {
|
| dispatcher_.OnCanWrite();
|
| }
|
|
|
| -TEST_F(QuicWriteBlockedListTest, OnCanWriteHandleBlock) {
|
| +TEST_F(QuicDispatcherWriteBlockedListTest, OnCanWriteHandleBlock) {
|
| // Finally make sure if we write block on a write call, we stop calling.
|
| InSequence s;
|
| SetBlocked();
|
| dispatcher_.OnWriteBlocked(connection1());
|
| dispatcher_.OnWriteBlocked(connection2());
|
| EXPECT_CALL(*connection1(), OnCanWrite()).WillOnce(
|
| - Invoke(this, &QuicWriteBlockedListTest::SetBlocked));
|
| + Invoke(this, &QuicDispatcherWriteBlockedListTest::SetBlocked));
|
| EXPECT_CALL(*connection2(), OnCanWrite()).Times(0);
|
| dispatcher_.OnCanWrite();
|
|
|
| @@ -426,7 +426,7 @@ TEST_F(QuicWriteBlockedListTest, OnCanWriteHandleBlock) {
|
| dispatcher_.OnCanWrite();
|
| }
|
|
|
| -TEST_F(QuicWriteBlockedListTest, LimitedWrites) {
|
| +TEST_F(QuicDispatcherWriteBlockedListTest, LimitedWrites) {
|
| // Make sure we call both writers. The first will register for more writing
|
| // but should not be immediately called due to limits.
|
| InSequence s;
|
| @@ -442,14 +442,14 @@ TEST_F(QuicWriteBlockedListTest, LimitedWrites) {
|
| dispatcher_.OnCanWrite();
|
| }
|
|
|
| -TEST_F(QuicWriteBlockedListTest, TestWriteLimits) {
|
| +TEST_F(QuicDispatcherWriteBlockedListTest, TestWriteLimits) {
|
| // Finally make sure if we write block on a write call, we stop calling.
|
| InSequence s;
|
| SetBlocked();
|
| dispatcher_.OnWriteBlocked(connection1());
|
| dispatcher_.OnWriteBlocked(connection2());
|
| EXPECT_CALL(*connection1(), OnCanWrite()).WillOnce(
|
| - Invoke(this, &QuicWriteBlockedListTest::SetBlocked));
|
| + Invoke(this, &QuicDispatcherWriteBlockedListTest::SetBlocked));
|
| EXPECT_CALL(*connection2(), OnCanWrite()).Times(0);
|
| dispatcher_.OnCanWrite();
|
|
|
|
|