Land Recent QUIC Changes until 03/06/2015.

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 431f44699c2900acdeb646d8b0dc04584d46d1f1..c6c7b5f82885df8624d3e72a9502b728be4f3af6 100644
--- a/net/quic/test_tools/simple_quic_framer.cc
+++ b/net/quic/test_tools/simple_quic_framer.cc
@@ -141,9 +141,6 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
   const QuicVersionNegotiationPacket* version_negotiation_packet() const {
     return version_negotiation_packet_.get();
   }
-  const QuicPublicResetPacket* public_reset_packet() const {
-    return public_reset_packet_.get();
-  }
 
  private:
   QuicErrorCode error_;
@@ -178,12 +175,6 @@ SimpleQuicFramer::SimpleQuicFramer(const QuicVersionVector& supported_versions)
 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());