Land Recent QUIC Changes

net/quic/test_tools/simple_quic_framer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/test_tools/simple_quic_framer.h"
 
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
 
 using base::StringPiece;
 using std::string;
 using std::vector;
 
 namespace net {
 namespace test {
 
 class SimpleFramerVisitor : public QuicFramerVisitorInterface {
  public:
   SimpleFramerVisitor()
       : error_(QUIC_NO_ERROR) {
   }
 
   virtual void OnError(QuicFramer* framer) {
     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;
     return true;
   }
 
   virtual void OnFecProtectedPayload(StringPiece payload) {}
 
   virtual void OnStreamFrame(const QuicStreamFrame& frame) {
     // Save a copy of the data so it is valid after the packet is processed.
@@ skipping 68 matching lines @@
   vector<QuicGoAwayFrame> goaway_frames_;
   vector<QuicConnectionCloseFrame> connection_close_frames_;
   vector<string> stream_data_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleFramerVisitor);
 };
 
 SimpleQuicFramer::SimpleQuicFramer()
     : framer_(kQuicVersion1,
               QuicDecrypter::Create(kNULL),
-              QuicEncrypter::Create(kNULL)) {
+              QuicEncrypter::Create(kNULL),
+              true),
+      visitor_(NULL) {
 }
 
 SimpleQuicFramer::~SimpleQuicFramer() {
 }
 
 bool SimpleQuicFramer::ProcessPacket(const QuicPacket& packet) {
   scoped_ptr<QuicEncryptedPacket> encrypted(framer_.EncryptPacket(0, packet));
   return ProcessPacket(*encrypted);
 }
 
@@ skipping 49 matching lines @@
   return visitor_->goaway_frames();
 }
 
 const vector<QuicConnectionCloseFrame>&
 SimpleQuicFramer::connection_close_frames() const {
   return visitor_->connection_close_frames();
 }
 
 }  // namespace test
 }  // namespace net