Land Recent QUIC changes.

net/quic/congestion_control/fix_rate_sender.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/congestion_control/fix_rate_sender.h"
 
 #include <math.h>
 
 #include "base/logging.h"
 #include "net/quic/quic_protocol.h"
@@ skipping 13 matching lines @@
       latest_rtt_(QuicTime::Delta::Zero()) {
   DLOG(INFO) << "FixRateSender";
 }
 
 FixRateSender::~FixRateSender() {
 }
 
 void FixRateSender::OnIncomingQuicCongestionFeedbackFrame(
     const QuicCongestionFeedbackFrame& feedback,
     QuicTime feedback_receive_time,
-    QuicBandwidth /*sent_bandwidth*/,
     const SentPacketsMap& /*sent_packets*/) {
   DCHECK(feedback.type == kFixRate) <<
       "Invalid incoming CongestionFeedbackType:" << feedback.type;
   if (feedback.type == kFixRate) {
     bitrate_ = feedback.fix_rate.bitrate;
     fix_rate_leaky_bucket_.SetDrainingRate(feedback_receive_time, bitrate_);
     paced_sender_.UpdateBandwidthEstimate(feedback_receive_time, bitrate_);
   }
   // Silently ignore invalid messages in release mode.
 }
@@ skipping 55 matching lines @@
 QuicBandwidth FixRateSender::BandwidthEstimate() {
   return bitrate_;
 }
 
 QuicTime::Delta FixRateSender::SmoothedRtt() {
   // TODO(satyamshekhar): Calculate and return smoothed rtt.
   return latest_rtt_;
 }
 
 }  // namespace net