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) OVERRIDE {
     error_ = framer->error();
   }
 
-  virtual bool OnProtocolVersionMismatch(QuicVersionTag version) OVERRIDE {
+  virtual bool OnProtocolVersionMismatch(QuicTag version) OVERRIDE {
     return false;
   }
 
   virtual void OnPacket() OVERRIDE {}
   virtual void OnPublicResetPacket(
       const QuicPublicResetPacket& packet) OVERRIDE {}
   virtual void OnVersionNegotiationPacket(
       const QuicVersionNegotiationPacket& packet) OVERRIDE {}
   virtual void OnRevivedPacket() OVERRIDE {}
 
@@ skipping 82 matching lines @@
   vector<QuicStreamFrame> stream_frames_;
   vector<QuicRstStreamFrame> rst_stream_frames_;
   vector<QuicGoAwayFrame> goaway_frames_;
   vector<QuicConnectionCloseFrame> connection_close_frames_;
   vector<string> stream_data_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleFramerVisitor);
 };
 
 SimpleQuicFramer::SimpleQuicFramer()
-    : framer_(kQuicVersion1,
-              QuicTime::Zero(),
-              true) {
+    : framer_(kQuicVersion1, QuicTime::Zero(), true) {
 }
 
 SimpleQuicFramer::~SimpleQuicFramer() {
 }
 
 bool SimpleQuicFramer::ProcessPacket(const QuicPacket& packet) {
   scoped_ptr<QuicEncryptedPacket> encrypted(framer_.EncryptPacket(
       ENCRYPTION_NONE, 0, packet));
   return ProcessPacket(*encrypted);
 }
 
 bool SimpleQuicFramer::ProcessPacket(const QuicEncryptedPacket& packet) {
   visitor_.reset(new SimpleFramerVisitor);
   framer_.set_visitor(visitor_.get());
   return framer_.ProcessPacket(packet);
 }
 
 const QuicPacketHeader& SimpleQuicFramer::header() const {
   return visitor_->header();
 }
 
 const QuicFecData& SimpleQuicFramer::fec_data() const {
   return visitor_->fec_data();
 }
 
+QuicFramer* SimpleQuicFramer::framer() {
+  return &framer_;
+}
+
 size_t SimpleQuicFramer::num_frames() const {
   return ack_frames().size() +
       stream_frames().size() +
       feedback_frames().size() +
       rst_stream_frames().size() +
       goaway_frames().size() +
       connection_close_frames().size();
 }
 
 const vector<QuicAckFrame>& SimpleQuicFramer::ack_frames() const {
@@ skipping 18 matching lines @@
   return visitor_->goaway_frames();
 }
 
 const vector<QuicConnectionCloseFrame>&
 SimpleQuicFramer::connection_close_frames() const {
   return visitor_->connection_close_frames();
 }
 
 }  // namespace test
 }  // namespace net