Landing Recent QUIC changes until 2016-07-02 02:45 UTC

net/quic/quic_alarm.cc

 // Copyright 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/quic_alarm.h"
 
 #include "base/logging.h"
 #include "net/quic/quic_flags.h"
 
 namespace net {
@@ skipping 17 matching lines @@
   }
   deadline_ = QuicTime::Zero();
   CancelImpl();
 }
 
 void QuicAlarm::Update(QuicTime new_deadline, QuicTime::Delta granularity) {
   if (!new_deadline.IsInitialized()) {
     Cancel();
     return;
   }
-  if (std::abs(new_deadline.Subtract(deadline_).ToMicroseconds()) <
+  if (std::abs((new_deadline - deadline_).ToMicroseconds()) <
       granularity.ToMicroseconds()) {
     return;
   }
   Cancel();
   Set(new_deadline);
 }
 
 bool QuicAlarm::IsSet() const {
   return deadline_.IsInitialized();
 }
 
 void QuicAlarm::Fire() {
   if (!IsSet()) {
     return;
   }
 
   deadline_ = QuicTime::Zero();
   delegate_->OnAlarm();
 }
 
 }  // namespace net