| Index: net/quic/congestion_control/rtt_stats.h
|
| diff --git a/net/quic/congestion_control/rtt_stats.h b/net/quic/congestion_control/rtt_stats.h
|
| index 5571aefd88d985397c8d2c6a46f6a9adf7093dba..0827fa3c5b0398fbf6d4af2e1ee4fb255a745860 100644
|
| --- a/net/quic/congestion_control/rtt_stats.h
|
| +++ b/net/quic/congestion_control/rtt_stats.h
|
| @@ -7,9 +7,11 @@
|
| #ifndef NET_QUIC_CONGESTION_CONTROL_RTT_STATS_H_
|
| #define NET_QUIC_CONGESTION_CONTROL_RTT_STATS_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <algorithm>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "net/quic/quic_protocol.h"
|
| #include "net/quic/quic_time.h"
|
|
|
| @@ -36,7 +38,7 @@ class NET_EXPORT_PRIVATE RttStats {
|
|
|
| // Forces RttStats to sample a new recent min rtt within the next
|
| // |num_samples| UpdateRtt calls.
|
| - void SampleNewRecentMinRtt(uint32 num_samples);
|
| + void SampleNewRecentMinRtt(uint32_t num_samples);
|
|
|
| // Called when connection migrates and rtt measurement needs to be reset.
|
| void OnConnectionMigration();
|
| @@ -45,10 +47,10 @@ class NET_EXPORT_PRIVATE RttStats {
|
| // May return Zero if no valid updates have occurred.
|
| QuicTime::Delta smoothed_rtt() const { return smoothed_rtt_; }
|
|
|
| - int64 initial_rtt_us() const { return initial_rtt_us_; }
|
| + int64_t initial_rtt_us() const { return initial_rtt_us_; }
|
|
|
| // Sets an initial RTT to be used for SmoothedRtt before any RTT updates.
|
| - void set_initial_rtt_us(int64 initial_rtt_us) {
|
| + void set_initial_rtt_us(int64_t initial_rtt_us) {
|
| if (initial_rtt_us <= 0) {
|
| LOG(DFATAL) << "Attempt to set initial rtt to <= 0.";
|
| return;
|
| @@ -97,10 +99,10 @@ class NET_EXPORT_PRIVATE RttStats {
|
| // Approximation of standard deviation, the error is roughly 1.25 times
|
| // larger than the standard deviation, for a normally distributed signal.
|
| QuicTime::Delta mean_deviation_;
|
| - int64 initial_rtt_us_;
|
| + int64_t initial_rtt_us_;
|
|
|
| RttSample new_min_rtt_;
|
| - uint32 num_min_rtt_samples_remaining_;
|
| + uint32_t num_min_rtt_samples_remaining_;
|
|
|
| // State variables for Kathleen Nichols MinRTT algorithm.
|
| QuicTime::Delta recent_min_rtt_window_;
|
|
|