Landing Recent QUIC changes until 4/22/2016 14:55 UTC

net/quic/test_tools/quic_test_utils.cc

Index: net/quic/test_tools/quic_test_utils.cc
diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
index 594bb9b7a16649c3c617f241f7c7b27dcace9c24..70e01a1197e29645017749d585848af5f0dfc0da 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -114,6 +114,8 @@ MockFramerVisitor::MockFramerVisitor() {
 
   ON_CALL(*this, OnStopWaitingFrame(_)).WillByDefault(testing::Return(true));
 
+  ON_CALL(*this, OnPaddingFrame(_)).WillByDefault(testing::Return(true));
+
   ON_CALL(*this, OnPingFrame(_)).WillByDefault(testing::Return(true));
 
   ON_CALL(*this, OnRstStreamFrame(_)).WillByDefault(testing::Return(true));
@@ -156,6 +158,10 @@ bool NoOpFramerVisitor::OnStopWaitingFrame(const QuicStopWaitingFrame& frame) {
   return true;
 }
 
+bool NoOpFramerVisitor::OnPaddingFrame(const QuicPaddingFrame& frame) {
+  return true;
+}
+
 bool NoOpFramerVisitor::OnPingFrame(const QuicPingFrame& frame) {
   return true;
 }