Index: net/quic/quic_bandwidth.cc |
diff --git a/net/quic/quic_bandwidth.cc b/net/quic/quic_bandwidth.cc |
index 911eb6c83cf4582e4cff41f2416c0fb3a11d5010..b7fe66dfd2355c7990b6e19487df122198ee35cb 100644 |
--- a/net/quic/quic_bandwidth.cc |
+++ b/net/quic/quic_bandwidth.cc |
@@ -13,7 +13,7 @@ |
namespace net { |
// Highest number that QuicBandwidth can hold. |
-const int64 kQuicInfiniteBandwidth = INT64_C(0x7fffffffffffffff); |
+const int64_t kQuicInfiniteBandwidth = INT64_C(0x7fffffffffffffff); |
// static |
QuicBandwidth QuicBandwidth::Zero() { |
@@ -21,24 +21,24 @@ QuicBandwidth QuicBandwidth::Zero() { |
} |
// static |
-QuicBandwidth QuicBandwidth::FromBitsPerSecond(int64 bits_per_second) { |
+QuicBandwidth QuicBandwidth::FromBitsPerSecond(int64_t bits_per_second) { |
return QuicBandwidth(bits_per_second); |
} |
// static |
-QuicBandwidth QuicBandwidth::FromKBitsPerSecond(int64 k_bits_per_second) { |
+QuicBandwidth QuicBandwidth::FromKBitsPerSecond(int64_t k_bits_per_second) { |
DCHECK(k_bits_per_second < kQuicInfiniteBandwidth / 1000); |
return QuicBandwidth(k_bits_per_second * 1000); |
} |
// static |
-QuicBandwidth QuicBandwidth::FromBytesPerSecond(int64 bytes_per_second) { |
+QuicBandwidth QuicBandwidth::FromBytesPerSecond(int64_t bytes_per_second) { |
DCHECK(bytes_per_second < kQuicInfiniteBandwidth / 8); |
return QuicBandwidth(bytes_per_second * 8); |
} |
// static |
-QuicBandwidth QuicBandwidth::FromKBytesPerSecond(int64 k_bytes_per_second) { |
+QuicBandwidth QuicBandwidth::FromKBytesPerSecond(int64_t k_bytes_per_second) { |
DCHECK(k_bytes_per_second < kQuicInfiniteBandwidth / 8000); |
return QuicBandwidth(k_bytes_per_second * 8000); |
} |
@@ -46,31 +46,31 @@ QuicBandwidth QuicBandwidth::FromKBytesPerSecond(int64 k_bytes_per_second) { |
// static |
QuicBandwidth QuicBandwidth::FromBytesAndTimeDelta(QuicByteCount bytes, |
QuicTime::Delta delta) { |
- DCHECK_LT(bytes, static_cast<uint64>(kQuicInfiniteBandwidth / |
- (8 * kNumMicrosPerSecond))); |
- int64 bytes_per_second = |
+ DCHECK_LT(bytes, static_cast<uint64_t>(kQuicInfiniteBandwidth / |
+ (8 * kNumMicrosPerSecond))); |
+ int64_t bytes_per_second = |
(bytes * kNumMicrosPerSecond) / delta.ToMicroseconds(); |
return QuicBandwidth(bytes_per_second * 8); |
} |
-QuicBandwidth::QuicBandwidth(int64 bits_per_second) |
+QuicBandwidth::QuicBandwidth(int64_t bits_per_second) |
: bits_per_second_(bits_per_second) { |
DCHECK_GE(bits_per_second, 0); |
} |
-int64 QuicBandwidth::ToBitsPerSecond() const { |
+int64_t QuicBandwidth::ToBitsPerSecond() const { |
return bits_per_second_; |
} |
-int64 QuicBandwidth::ToKBitsPerSecond() const { |
+int64_t QuicBandwidth::ToKBitsPerSecond() const { |
return bits_per_second_ / 1000; |
} |
-int64 QuicBandwidth::ToBytesPerSecond() const { |
+int64_t QuicBandwidth::ToBytesPerSecond() const { |
return bits_per_second_ / 8; |
} |
-int64 QuicBandwidth::ToKBytesPerSecond() const { |
+int64_t QuicBandwidth::ToKBytesPerSecond() const { |
return bits_per_second_ / 8000; |
} |
@@ -80,7 +80,7 @@ QuicByteCount QuicBandwidth::ToBytesPerPeriod( |
kNumMicrosPerSecond; |
} |
-int64 QuicBandwidth::ToKBytesPerPeriod(QuicTime::Delta time_period) const { |
+int64_t QuicBandwidth::ToKBytesPerPeriod(QuicTime::Delta time_period) const { |
return ToKBytesPerSecond() * time_period.ToMicroseconds() / |
kNumMicrosPerSecond; |
} |
@@ -98,7 +98,7 @@ QuicBandwidth QuicBandwidth::Subtract(const QuicBandwidth& delta) const { |
} |
QuicBandwidth QuicBandwidth::Scale(float scale_factor) const { |
- return QuicBandwidth(static_cast<int64>(bits_per_second_ * scale_factor)); |
+ return QuicBandwidth(static_cast<int64_t>(bits_per_second_ * scale_factor)); |
} |
QuicTime::Delta QuicBandwidth::TransferTime(QuicByteCount bytes) const { |