Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(858)

Unified Diff: net/quic/test_tools/quic_test_utils.h

Issue 2547583002: Landing Recent QUIC changes until Fri Nov 18 23:21:04 2016 +0000 (Closed)
Patch Set: Remove explicit HTTP/2 enum usage Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/test_tools/quic_test_packet_maker.h ('k') | net/quic/test_tools/simple_quic_framer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/test_tools/quic_test_utils.h
diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h
index ca5712a59ab17fcd0dbda30f88ce011b0be2b716..6428c1ebd4276f2a67cacfa4d17ef692475e0351 100644
--- a/net/quic/test_tools/quic_test_utils.h
+++ b/net/quic/test_tools/quic_test_utils.h
@@ -26,7 +26,7 @@
#include "net/quic/core/quic_connection_close_delegate_interface.h"
#include "net/quic/core/quic_framer.h"
#include "net/quic/core/quic_iovector.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
#include "net/quic/core/quic_sent_packet_manager_interface.h"
#include "net/quic/core/quic_server_session_base.h"
#include "net/quic/core/quic_session.h"
@@ -915,7 +915,7 @@ class MockSentPacketManager : public QuicSentPacketManagerInterface {
MOCK_METHOD0(MaybeRetransmitTailLossProbe, bool(void));
MOCK_METHOD0(NeuterUnencryptedPackets, void(void));
MOCK_CONST_METHOD0(HasPendingRetransmissions, bool(void));
- MOCK_METHOD0(NextPendingRetransmission, PendingRetransmission(void));
+ MOCK_METHOD0(NextPendingRetransmission, QuicPendingRetransmission(void));
MOCK_CONST_METHOD0(HasUnackedPackets, bool(void));
MOCK_CONST_METHOD1(GetLeastUnacked, QuicPacketNumber(QuicPathId));
MOCK_METHOD6(OnPacketSent,
@@ -950,6 +950,7 @@ class MockSentPacketManager : public QuicSentPacketManagerInterface {
MOCK_CONST_METHOD0(GetConsecutiveRtoCount, size_t(void));
MOCK_CONST_METHOD0(GetConsecutiveTlpCount, size_t(void));
MOCK_METHOD0(OnApplicationLimited, void(void));
+ MOCK_CONST_METHOD0(GetSendAlgorithm, const SendAlgorithmInterface*(void));
};
class MockConnectionCloseDelegate
« no previous file with comments | « net/quic/test_tools/quic_test_packet_maker.h ('k') | net/quic/test_tools/simple_quic_framer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698