Update from https://crrev.com/312398

net/quic/test_tools/quic_test_utils.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/quic_test_utils.h"
 
 #include "base/sha1.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/crypto/crypto_framer.h"
@@ skipping 90 matching lines @@
 
   ON_CALL(*this, OnPacketHeader(_))
       .WillByDefault(testing::Return(true));
 
   ON_CALL(*this, OnStreamFrame(_))
       .WillByDefault(testing::Return(true));
 
   ON_CALL(*this, OnAckFrame(_))
       .WillByDefault(testing::Return(true));
 
-  ON_CALL(*this, OnCongestionFeedbackFrame(_))
-      .WillByDefault(testing::Return(true));
-
   ON_CALL(*this, OnStopWaitingFrame(_))
       .WillByDefault(testing::Return(true));
 
   ON_CALL(*this, OnPingFrame(_))
       .WillByDefault(testing::Return(true));
 
   ON_CALL(*this, OnRstStreamFrame(_))
       .WillByDefault(testing::Return(true));
 
   ON_CALL(*this, OnConnectionCloseFrame(_))
@@ skipping 25 matching lines @@
 }
 
 bool NoOpFramerVisitor::OnStreamFrame(const QuicStreamFrame& frame) {
   return true;
 }
 
 bool NoOpFramerVisitor::OnAckFrame(const QuicAckFrame& frame) {
   return true;
 }
 
-bool NoOpFramerVisitor::OnCongestionFeedbackFrame(
-    const QuicCongestionFeedbackFrame& frame) {
-  return true;
-}
-
 bool NoOpFramerVisitor::OnStopWaitingFrame(
     const QuicStopWaitingFrame& frame) {
   return true;
 }
 
 bool NoOpFramerVisitor::OnPingFrame(const QuicPingFrame& frame) {
   return true;
 }
 
 bool NoOpFramerVisitor::OnRstStreamFrame(
@@ skipping 502 matching lines @@
   // called.
   factory_->current_writer_ = this;
   return QuicPerConnectionPacketWriter::WritePacket(buffer,
                                                     buf_len,
                                                     self_address,
                                                     peer_address);
 }
 
 }  // namespace test
 }  // namespace net