Update from https://crrev.com/312398

net/quic/quic_config.h

 // Copyright (c) 2013 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.
 
 #ifndef NET_QUIC_QUIC_CONFIG_H_
 #define NET_QUIC_QUIC_CONFIG_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 238 matching lines @@
   bool has_receive_values_;
 };
 
 // QuicConfig contains non-crypto configuration options that are negotiated in
 // the crypto handshake.
 class NET_EXPORT_PRIVATE QuicConfig {
  public:
   QuicConfig();
   ~QuicConfig();
 
-  void SetCongestionFeedback(const QuicTagVector& congestion_feedback,
-                             QuicTag default_congestion_feedback);
-
-  QuicTag CongestionFeedback() const;
-
   void SetConnectionOptionsToSend(const QuicTagVector& connection_options);
 
   bool HasReceivedConnectionOptions() const;
 
   QuicTagVector ReceivedConnectionOptions() const;
 
   bool HasSendConnectionOptions() const;
 
   QuicTagVector SendConnectionOptions() const;
 
@@ skipping 131 matching lines @@
   // Initial session flow control receive window in bytes.
   QuicFixedUint32 initial_session_flow_control_window_bytes_;
 
   // Socket receive buffer in bytes.
   QuicFixedUint32 socket_receive_buffer_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CONFIG_H_