Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1200)

Unified Diff: net/quic/congestion_control/paced_sender.cc

Issue 189403002: QUIC - Minor cleanup changes to match the internal source code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use public ::testing:: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/quic/congestion_control/tcp_loss_algorithm_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/congestion_control/paced_sender.cc
diff --git a/net/quic/congestion_control/paced_sender.cc b/net/quic/congestion_control/paced_sender.cc
index 731fdc5abf44a04d4c9a1e78d2732dab444f7217..87042a5a23ad9d9281097cc859003360b7acf5f2 100644
--- a/net/quic/congestion_control/paced_sender.cc
+++ b/net/quic/congestion_control/paced_sender.cc
@@ -8,6 +8,8 @@
#include "net/quic/quic_protocol.h"
+using std::max;
+
namespace net {
// To prevent too aggressive pacing we allow the following packet burst size.
@@ -41,7 +43,7 @@ QuicTime::Delta PacedSender::TimeUntilSend(QuicTime now,
QuicByteCount pacing_window = pace_.ToBytesPerPeriod(
QuicTime::Delta::FromMicroseconds(kMaxSchedulingDelayUs));
QuicByteCount min_window_size = kMinPacketBurstSize * max_segment_size_;
- pacing_window = std::max(pacing_window, min_window_size);
+ pacing_window = max(pacing_window, min_window_size);
if (pacing_window > leaky_bucket_.BytesPending(now)) {
// We have not filled our pacing window yet.
« no previous file with comments | « no previous file | net/quic/congestion_control/tcp_loss_algorithm_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698