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

net/quic/quic_server_session_base.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_server_session_base.h"
 
 #include "base/logging.h"
 #include "net/quic/proto/cached_network_parameters.pb.h"
 #include "net/quic/quic_bug_tracker.h"
 #include "net/quic/quic_connection.h"
@@ skipping 98 matching lines @@
   if (HasDataToWrite()) {
     return;
   }
 
   // If not enough time has passed since the last time we sent an update to the
   // client, or not enough packets have been sent, then return early.
   const QuicSentPacketManagerInterface& sent_packet_manager =
       connection()->sent_packet_manager();
   int64_t srtt_ms =
       sent_packet_manager.GetRttStats()->smoothed_rtt().ToMilliseconds();
-  int64_t now_ms = now.Subtract(last_scup_time_).ToMilliseconds();
+  int64_t now_ms = (now - last_scup_time_).ToMilliseconds();
   int64_t packets_since_last_scup =
       connection()->packet_number_of_last_sent_packet() -
       last_scup_packet_number_;
   if (now_ms < (kMinIntervalBetweenServerConfigUpdatesRTTs * srtt_ms) ||
       now_ms < kMinIntervalBetweenServerConfigUpdatesMs ||
       packets_since_last_scup < kMinPacketsBetweenServerConfigUpdates) {
     return;
   }
 
   // If the bandwidth recorder does not have a valid estimate, return early.
@@ skipping 118 matching lines @@
 
 int32_t QuicServerSessionBase::BandwidthToCachedParameterBytesPerSecond(
     const QuicBandwidth& bandwidth) {
   int64_t bytes_per_second = bandwidth.ToBytesPerSecond();
   return (bytes_per_second > static_cast<int64_t>(INT32_MAX)
               ? INT32_MAX
               : static_cast<int32_t>(bytes_per_second));
 }
 
 }  // namespace net