commit 5b3c3be1edacc6a3364743ff3119f154ec5c0c08
author bnc <bnc@google.com> Tue Jun 25 10:37:09 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jun 25 11:48:54 2019 -0700
tree 63e1c4007dc6898e4e3a844334597b159fd7c19e
parent 9349f36765f0fceba4145f10b26db327507e1c04

Add ClearControlFrame() to quic_test_utils.

This function does not have to live in a class and does not need seven identical
definitions.

gfe-relnote: n/a, test-only refactoring.
PiperOrigin-RevId: 254999491
Change-Id: I1173acb47388e3a5ca010c927c4e886d3b6ab387

quic/core/quic_control_frame_manager_test.cc

diff --git a/quic/core/quic_control_frame_manager_test.cc b/quic/core/quic_control_frame_manager_test.cc
index ccddadd..216ba74 100644
--- a/quic/core/quic_control_frame_manager_test.cc
+++ b/quic/core/quic_control_frame_manager_test.cc
@@ -11,6 +11,7 @@
 
 using testing::_;
 using testing::InSequence;
+using testing::Invoke;
 using testing::Return;
 using testing::StrictMock;
 
@@ -31,10 +32,6 @@
 
 class QuicControlFrameManagerTest : public QuicTest {
  public:
-  bool ClearControlFrame(const QuicFrame& frame) {
-    DeleteFrame(&const_cast<QuicFrame&>(frame));
-    return true;
-  }
   bool SaveControlFrame(const QuicFrame& frame) {
     frame_ = frame;
     return true;
@@ -103,8 +100,7 @@
   InSequence s;
   EXPECT_CALL(*connection_, SendControlFrame(_))
       .Times(3)
-      .WillRepeatedly(
-          Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillRepeatedly(Invoke(&ClearControlFrame));
   EXPECT_CALL(*connection_, SendControlFrame(_)).WillOnce(Return(false));
   // Send control frames 1, 2, 3.
   manager_->OnCanWrite();
@@ -139,8 +135,7 @@
 
   // Send control frames 4, 5.
   EXPECT_CALL(*connection_, SendControlFrame(_))
-      .WillRepeatedly(
-          Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillRepeatedly(Invoke(&ClearControlFrame));
   manager_->OnCanWrite();
   manager_->WritePing();
   EXPECT_FALSE(manager_->WillingToWrite());
@@ -151,8 +146,7 @@
   InSequence s;
   EXPECT_CALL(*connection_, SendControlFrame(_))
       .Times(3)
-      .WillRepeatedly(
-          Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillRepeatedly(Invoke(&ClearControlFrame));
   EXPECT_CALL(*connection_, SendControlFrame(_)).WillOnce(Return(false));
   // Send control frames 1, 2, 3.
   manager_->OnCanWrite();
@@ -169,8 +163,7 @@
   // Retransmit control frames 1, 3.
   EXPECT_CALL(*connection_, SendControlFrame(_))
       .Times(2)
-      .WillRepeatedly(
-          Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillRepeatedly(Invoke(&ClearControlFrame));
   manager_->OnCanWrite();
   EXPECT_FALSE(manager_->HasPendingRetransmission());
   EXPECT_TRUE(manager_->WillingToWrite());
@@ -178,8 +171,7 @@
   // Send control frames 4, 5, and 6.
   EXPECT_CALL(*connection_, SendControlFrame(_))
       .Times(number_of_frames_ - 2u)
-      .WillRepeatedly(
-          Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillRepeatedly(Invoke(&ClearControlFrame));
   manager_->OnCanWrite();
   manager_->WritePing();
   EXPECT_FALSE(manager_->WillingToWrite());
@@ -191,8 +183,7 @@
   // Send control frames 1, 2, 3, 4.
   EXPECT_CALL(*connection_, SendControlFrame(_))
       .Times(number_of_frames_)
-      .WillRepeatedly(
-          Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillRepeatedly(Invoke(&ClearControlFrame));
   manager_->OnCanWrite();
 
   // Ack control frame 2.
@@ -203,7 +194,7 @@
 
   // Retransmit control frame 3.
   EXPECT_CALL(*connection_, SendControlFrame(_))
-      .WillOnce(Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillOnce(Invoke(&ClearControlFrame));
   EXPECT_TRUE(manager_->RetransmitControlFrame(QuicFrame(&window_update_)));
 
   // Retransmit control frame 4, and connection is write blocked.
@@ -215,7 +206,7 @@
   Initialize();
   InSequence s;
   EXPECT_CALL(*connection_, SendControlFrame(_))
-      .WillOnce(Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillOnce(Invoke(&ClearControlFrame));
   EXPECT_CALL(*connection_, SendControlFrame(_)).WillOnce(Return(false));
   // Send control frame 1.
   manager_->OnCanWrite();
@@ -227,8 +218,7 @@
   // Verify only the buffered frames are sent.
   EXPECT_CALL(*connection_, SendControlFrame(_))
       .Times(number_of_frames_ - 1)
-      .WillRepeatedly(
-          Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillRepeatedly(Invoke(&ClearControlFrame));
   manager_->OnCanWrite();
   EXPECT_FALSE(manager_->HasPendingRetransmission());
   EXPECT_FALSE(manager_->WillingToWrite());
@@ -247,8 +237,7 @@
   InSequence s;
   // Flush all buffered control frames.
   EXPECT_CALL(*connection_, SendControlFrame(_))
-      .WillRepeatedly(
-          Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillRepeatedly(Invoke(&ClearControlFrame));
   manager_->OnCanWrite();
 
   // Mark all 3 window updates as lost.
@@ -280,8 +269,7 @@
   InSequence s;
   // Flush all buffered control frames.
   EXPECT_CALL(*connection_, SendControlFrame(_))
-      .WillRepeatedly(
-          Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillRepeatedly(Invoke(&ClearControlFrame));
   manager_->OnCanWrite();
 
   // Mark all 3 window updates as lost.
@@ -294,8 +282,7 @@
   // Verify all 3 window updates get retransmitted.
   EXPECT_CALL(*connection_, SendControlFrame(_))
       .Times(3)
-      .WillRepeatedly(
-          Invoke(this, &QuicControlFrameManagerTest::ClearControlFrame));
+      .WillRepeatedly(Invoke(&ClearControlFrame));
   manager_->OnCanWrite();
   EXPECT_FALSE(manager_->HasPendingRetransmission());
   EXPECT_FALSE(manager_->WillingToWrite());