Land Recent QUIC Changes

net/quic/test_tools/simple_quic_framer.cc

Index: net/quic/test_tools/simple_quic_framer.cc
diff --git a/net/quic/test_tools/simple_quic_framer.cc b/net/quic/test_tools/simple_quic_framer.cc
index 5dec9d0217cb383e0a9cef2b9b6976fc31486674..d529ac7cd135de03abe0486a3994b30985de3701 100644
--- a/net/quic/test_tools/simple_quic_framer.cc
+++ b/net/quic/test_tools/simple_quic_framer.cc
@@ -25,9 +25,16 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
     error_ = framer->error();
   }
 
+  virtual bool OnProtocolVersionMismatch(QuicVersionTag version) {
+    return false;
+  }
+
   virtual void OnPacket() {}
   virtual void OnPublicResetPacket(const QuicPublicResetPacket& packet) {}
+  virtual void OnVersionNegotiationPacket(
+      const QuicVersionNegotiationPacket& packet) {}
   virtual void OnRevivedPacket() {}
+
   virtual bool OnPacketHeader(const QuicPacketHeader& header) {
     has_header_ = true;
     header_ = header;
@@ -116,7 +123,9 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
 SimpleQuicFramer::SimpleQuicFramer()
     : framer_(kQuicVersion1,
               QuicDecrypter::Create(kNULL),
-              QuicEncrypter::Create(kNULL)) {
+              QuicEncrypter::Create(kNULL),
+              true),
+      visitor_(NULL) {
 }
 
 SimpleQuicFramer::~SimpleQuicFramer() {