Update from https://crrev.com/312398

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 0f413d712203e316d749062abb1d4a73dc7f8371..f9f37ad5562b3f72c04aa781a27e11fac94c8c08 100644
--- a/net/quic/test_tools/simple_quic_framer.cc
+++ b/net/quic/test_tools/simple_quic_framer.cc
@@ -72,12 +72,6 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
     return true;
   }
 
-  bool OnCongestionFeedbackFrame(
-      const QuicCongestionFeedbackFrame& frame) override {
-    feedback_frames_.push_back(frame);
-    return true;
-  }
-
   bool OnStopWaitingFrame(const QuicStopWaitingFrame& frame) override {
     stop_waiting_frames_.push_back(frame);
     return true;
@@ -126,9 +120,6 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
   const vector<QuicConnectionCloseFrame>& connection_close_frames() const {
     return connection_close_frames_;
   }
-  const vector<QuicCongestionFeedbackFrame>& feedback_frames() const {
-    return feedback_frames_;
-  }
   const vector<QuicGoAwayFrame>& goaway_frames() const {
     return goaway_frames_;
   }
@@ -163,7 +154,6 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
   scoped_ptr<QuicPublicResetPacket> public_reset_packet_;
   string fec_redundancy_;
   vector<QuicAckFrame> ack_frames_;
-  vector<QuicCongestionFeedbackFrame> feedback_frames_;
   vector<QuicStopWaitingFrame> stop_waiting_frames_;
   vector<QuicPingFrame> ping_frames_;
   vector<QuicStreamFrame> stream_frames_;
@@ -228,7 +218,6 @@ QuicFramer* SimpleQuicFramer::framer() {
 
 size_t SimpleQuicFramer::num_frames() const {
   return ack_frames().size() +
-      feedback_frames().size() +
       goaway_frames().size() +
       rst_stream_frames().size() +
       stop_waiting_frames().size() +
@@ -258,11 +247,6 @@ const vector<QuicRstStreamFrame>& SimpleQuicFramer::rst_stream_frames() const {
   return visitor_->rst_stream_frames();
 }
 
-const vector<QuicCongestionFeedbackFrame>&
-SimpleQuicFramer::feedback_frames() const {
-  return visitor_->feedback_frames();
-}
-
 const vector<QuicGoAwayFrame>&
 SimpleQuicFramer::goaway_frames() const {
   return visitor_->goaway_frames();