Land Recent QUIC changes.

net/quic/quic_connection_helper.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/quic_connection_helper.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/task_runner.h"
 #include "base/time.h"
@@ skipping 99 matching lines @@
   send_alarm_registered_ = true;
   task_runner_->PostDelayedTask(
       FROM_HERE,
       base::Bind(&QuicConnectionHelper::OnSendAlarm,
                  weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMicroseconds(
           alarm_time.Subtract(QuicTime::Zero()).ToMicroseconds()));
 }
 
 void QuicConnectionHelper::SetTimeoutAlarm(QuicTime::Delta delay) {
-  DCHECK(!timeout_alarm_registered_);
+  // CheckForTimeout will call SetTimeoutAlarm for the remaining time if alarm
+  // goes off before the delay.
+  if (timeout_alarm_registered_)
+    return;
   timeout_alarm_registered_ = true;
   task_runner_->PostDelayedTask(
       FROM_HERE,
       base::Bind(&QuicConnectionHelper::OnTimeoutAlarm,
                  weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMicroseconds(delay.ToMicroseconds()));
 }
 
 bool QuicConnectionHelper::IsSendAlarmSet() {
   return send_alarm_registered_;
@@ skipping 38 matching lines @@
   ack_alarm_time_ = QuicTime::Zero();
   connection_->SendAck();
 }
 
 void QuicConnectionHelper::OnWriteComplete(int result) {
   // TODO(rch): Inform the connection about the result.
   connection_->OnCanWrite();
 }
 
 }  // namespace net