Landing Recent QUIC changes until 7/18/2016 11:21:53 UTC

net/tools/quic/quic_dispatcher.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/tools/quic/quic_dispatcher.h"
 
 #include <utility>
 
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
@@ skipping 457 matching lines @@
     QUIC_BUG << base::debug::StackTrace().ToString();
     return;
   }
 
   DVLOG_IF(1, error != QUIC_NO_ERROR)
       << "Closing connection (" << connection_id
       << ") due to error: " << QuicUtils::ErrorToString(error)
       << ", with details: " << error_details;
 
   if (closed_session_list_.empty()) {
-    delete_sessions_alarm_->Cancel();
-    delete_sessions_alarm_->Set(helper()->GetClock()->ApproximateNow());
+    delete_sessions_alarm_->Update(helper()->GetClock()->ApproximateNow(),
+                                   QuicTime::Delta::Zero());
   }
   closed_session_list_.push_back(it->second);
   const bool should_close_statelessly =
       (error == QUIC_CRYPTO_HANDSHAKE_STATELESS_REJECT);
   CleanUpSession(it, should_close_statelessly);
 }
 
 void QuicDispatcher::OnWriteBlocked(
     QuicBlockedWriterInterface* blocked_writer) {
   if (!writer_->IsWriteBlocked()) {
@@ skipping 254 matching lines @@
   if (disable_quic_pre_30_ != FLAGS_quic_disable_pre_30) {
     DCHECK_EQ(supported_versions_.capacity(),
               allowed_supported_versions_.capacity());
     disable_quic_pre_30_ = FLAGS_quic_disable_pre_30;
     supported_versions_ = FilterSupportedVersions(allowed_supported_versions_);
   }
   return supported_versions_;
 }
 
 }  // namespace net