Update from https://crrev.com/304418

net/quic/congestion_control/pacing_sender.cc

 // 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.
 
 #include "net/quic/congestion_control/pacing_sender.h"
 
 namespace net {
 
 PacingSender::PacingSender(SendAlgorithmInterface* sender,
                            QuicTime::Delta alarm_granularity,
                            uint32 initial_packet_burst)
     : sender_(sender),
       alarm_granularity_(alarm_granularity),
       initial_packet_burst_(initial_packet_burst),
       burst_tokens_(initial_packet_burst),
       last_delayed_packet_sent_time_(QuicTime::Zero()),
       next_packet_send_time_(QuicTime::Zero()),
       was_last_send_delayed_(false) {
 }
 
 PacingSender::~PacingSender() {}
 
-void PacingSender::SetFromConfig(const QuicConfig& config, bool is_server) {
-  sender_->SetFromConfig(config, is_server);
+void PacingSender::SetFromConfig(const QuicConfig& config,
+                                 bool is_server,
+                                 bool using_pacing) {
+  DCHECK(using_pacing);
+  sender_->SetFromConfig(config, is_server, using_pacing);
 }
 
 void PacingSender::SetNumEmulatedConnections(int num_connections) {
   sender_->SetNumEmulatedConnections(num_connections);
 }
 
 void PacingSender::OnCongestionEvent(bool rtt_updated,
                                      QuicByteCount bytes_in_flight,
                                      const CongestionVector& acked_packets,
                                      const CongestionVector& lost_packets) {
@@ skipping 129 matching lines @@
 
 QuicByteCount PacingSender::GetSlowStartThreshold() const {
   return sender_->GetSlowStartThreshold();
 }
 
 CongestionControlType PacingSender::GetCongestionControlType() const {
   return sender_->GetCongestionControlType();
 }
 
 }  // namespace net