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

net/quic/quic_chromium_alarm_factory.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_chromium_alarm_factory.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/sparse_histogram.h"
@@ skipping 23 matching lines @@
         // Since tasks can not be un-posted, OnAlarm will be invoked which
         // will notice that deadline has not yet been reached, and will set
         // the alarm for the new deadline.
         return;
       }
       // The scheduled task is after new deadline.  Invalidate the weak ptrs
       // so that task does not execute when we're not expecting it.
       weak_factory_.InvalidateWeakPtrs();
     }
 
-    int64_t delay_us = deadline().Subtract(clock_->Now()).ToMicroseconds();
+    int64_t delay_us = (deadline() - (clock_->Now())).ToMicroseconds();
     if (delay_us < 0) {
       delay_us = 0;
     }
     task_runner_->PostDelayedTask(
         FROM_HERE,
         base::Bind(&QuicChromeAlarm::OnAlarm, weak_factory_.GetWeakPtr()),
         base::TimeDelta::FromMicroseconds(delay_us));
     task_deadline_ = deadline();
   }
 
@@ skipping 53 matching lines @@
   }
 }
 
 QuicAlarm* QuicChromiumAlarmFactory::CreateAlarm(
     QuicAlarm::Delegate* delegate) {
   return new QuicChromeAlarm(clock_, task_runner_,
                              QuicArenaScopedPtr<QuicAlarm::Delegate>(delegate));
 }
 
 }  // namespace net