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 "base/stl_util.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 ~SimpleFramerVisitor() {
+  virtual ~SimpleFramerVisitor() OVERRIDE {
     STLDeleteElements(&stream_data_);
   }
 
   virtual void OnError(QuicFramer* framer) OVERRIDE {
     error_ = framer->error();
   }
 
   virtual bool OnProtocolVersionMismatch(QuicVersion version) OVERRIDE {
     return false;
   }
@@ skipping 172 matching lines @@
   return visitor_->goaway_frames();
 }
 
 const vector<QuicConnectionCloseFrame>&
 SimpleQuicFramer::connection_close_frames() const {
   return visitor_->connection_close_frames();
 }
 
 }  // namespace test
 }  // namespace net