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

net/quic/quic_buffered_packet_store.cc

 // Copyright (c) 2016 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_buffered_packet_store.h"
 
 #include <list>
 
 #include "base/stl_util.h"
 
@@ skipping 91 matching lines @@
     // creation time.
     queue.creation_time = clock_->ApproximateNow();
   }
 
   BufferedPacket new_entry(std::unique_ptr<QuicReceivedPacket>(packet.Clone()),
                            server_address, client_address);
 
   queue.buffered_packets.push_back(std::move(new_entry));
 
   if (!expiration_alarm_->IsSet()) {
-    expiration_alarm_->Set(clock_->ApproximateNow().Add(connection_life_span_));
+    expiration_alarm_->Set(clock_->ApproximateNow() + connection_life_span_);
   }
   return SUCCESS;
 }
 
 bool QuicBufferedPacketStore::HasBufferedPackets(
     QuicConnectionId connection_id) const {
   return ContainsKey(undecryptable_packets_, connection_id);
 }
 
 list<BufferedPacket> QuicBufferedPacketStore::DeliverPackets(
     QuicConnectionId connection_id) {
   list<BufferedPacket> packets_to_deliver;
   auto it = undecryptable_packets_.find(connection_id);
   if (it != undecryptable_packets_.end()) {
     packets_to_deliver = std::move(it->second.buffered_packets);
     undecryptable_packets_.erase(connection_id);
   }
   return packets_to_deliver;
 }
 
 void QuicBufferedPacketStore::OnExpirationTimeout() {
-  QuicTime expiration_time =
-      clock_->ApproximateNow().Subtract(connection_life_span_);
+  QuicTime expiration_time = clock_->ApproximateNow() - connection_life_span_;
   while (!undecryptable_packets_.empty()) {
     auto& entry = undecryptable_packets_.front();
     if (entry.second.creation_time > expiration_time) {
       break;
     }
     visitor_->OnExpiredPackets(entry.first, std::move(entry.second));
     undecryptable_packets_.erase(undecryptable_packets_.begin());
   }
   if (!undecryptable_packets_.empty()) {
-    expiration_alarm_->Set(clock_->ApproximateNow().Add(connection_life_span_));
+    expiration_alarm_->Set(clock_->ApproximateNow() + connection_life_span_);
   }
 }
 
 }  // namespace net