Allow new MOCK_METHOD in QUIC google3 has deprecated MOCK_METHODxx (where xx is the number of arguments). We've confirmed that this now works in Chromium on Windows thanks to <https://crrev.com/c/2152991>. gfe-relnote: n/a, test-only PiperOrigin-RevId: 306908235 Change-Id: I0e24723444a7c2c843a721fde4795b3a8d5d3f6a
diff --git a/quic/core/quic_session_test.cc b/quic/core/quic_session_test.cc index 4da502d..d50931c 100644 --- a/quic/core/quic_session_test.cc +++ b/quic/core/quic_session_test.cc
@@ -122,10 +122,10 @@ return one_rtt_keys_available() ? HANDSHAKE_COMPLETE : HANDSHAKE_START; } - MOCK_METHOD0(OnCanWrite, void()); + MOCK_METHOD(void, OnCanWrite, (), (override)); bool HasPendingCryptoRetransmission() const override { return false; } - MOCK_CONST_METHOD0(HasPendingRetransmission, bool()); + MOCK_METHOD(bool, HasPendingRetransmission, (), (const, override)); private: using QuicCryptoStream::session; @@ -155,11 +155,13 @@ void OnDataAvailable() override {} - MOCK_METHOD0(OnCanWrite, void()); - MOCK_METHOD4(RetransmitStreamData, - bool(QuicStreamOffset, QuicByteCount, bool, TransmissionType)); + MOCK_METHOD(void, OnCanWrite, (), (override)); + MOCK_METHOD(bool, + RetransmitStreamData, + (QuicStreamOffset, QuicByteCount, bool, TransmissionType), + (override)); - MOCK_CONST_METHOD0(HasPendingRetransmission, bool()); + MOCK_METHOD(bool, HasPendingRetransmission, (), (override, const)); }; class TestSession : public QuicSession { @@ -286,7 +288,10 @@ return consumed; } - MOCK_METHOD1(OnCanCreateNewOutgoingStream, void(bool unidirectional)); + MOCK_METHOD(void, + OnCanCreateNewOutgoingStream, + (bool unidirectional), + (override)); void set_writev_consumes_all_data(bool val) { writev_consumes_all_data_ = val;