Land Recent QUIC changes.

net/quic/congestion_control/inter_arrival_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/inter_arrival_sender.h"
 
 namespace net {
 
 namespace {
 const int64 kProbeBitrateKBytesPerSecond = 1200;  // 9.6 Mbit/s
@@ skipping 306 matching lines @@
   }
   return smoothed_rtt_;
 }
 
 QuicTime::Delta InterArrivalSender::RetransmissionDelay() {
   // TODO(pwestin): Calculate and return retransmission delay.
   // Use 2 * the smoothed RTT for now.
   return smoothed_rtt_.Add(smoothed_rtt_);
 }
 
+QuicByteCount InterArrivalSender::GetCongestionWindow() {
+  return 0;
+}
+
+void InterArrivalSender::SetCongestionWindow(QuicByteCount window) {
+}
+
 void InterArrivalSender::EstimateNewBandwidth(QuicTime feedback_receive_time,
                                               QuicBandwidth sent_bandwidth) {
   QuicBandwidth new_bandwidth = bitrate_ramp_up_->GetNewBitrate(sent_bandwidth);
   if (current_bandwidth_ == new_bandwidth) {
     return;
   }
   current_bandwidth_ = new_bandwidth;
   state_machine_->IncreaseBitrateDecision();
 
   QuicBandwidth channel_estimate = QuicBandwidth::Zero();
@@ skipping 162 matching lines @@
   bitrate_ramp_up_->Reset(new_rate, current_bandwidth_, channel_estimate);
   if (new_rate != current_bandwidth_) {
     current_bandwidth_ = new_rate;
     paced_sender_->UpdateBandwidthEstimate(feedback_receive_time,
                                            current_bandwidth_);
     state_machine_->DecreaseBitrateDecision();
   }
 }
 
 }  // namespace net