| Index: net/quic/core/quic_sent_packet_manager.cc
|
| diff --git a/net/quic/core/quic_sent_packet_manager.cc b/net/quic/core/quic_sent_packet_manager.cc
|
| index 1752d35c7a24e6da211d218d931f6620f7047e97..5a4342742c9f86a3de3182f9765c1968e0570ce6 100644
|
| --- a/net/quic/core/quic_sent_packet_manager.cc
|
| +++ b/net/quic/core/quic_sent_packet_manager.cc
|
| @@ -7,6 +7,7 @@
|
| #include <algorithm>
|
| #include <string>
|
|
|
| +#include "base/logging.h"
|
| #include "base/stl_util.h"
|
| #include "net/quic/chromium/quic_utils_chromium.h"
|
| #include "net/quic/core/congestion_control/general_loss_algorithm.h"
|
| @@ -17,7 +18,6 @@
|
| #include "net/quic/core/quic_flags.h"
|
| #include "net/quic/core/quic_pending_retransmission.h"
|
| #include "net/quic/platform/api/quic_bug_tracker.h"
|
| -#include "net/quic/platform/api/quic_logging.h"
|
|
|
| namespace net {
|
|
|
| @@ -342,7 +342,7 @@
|
| continue;
|
| }
|
| // Packet was acked, so remove it from our unacked packet list.
|
| - QUIC_DVLOG(1) << ENDPOINT << "Got an ack for packet " << packet_number;
|
| + DVLOG(1) << ENDPOINT << "Got an ack for packet " << packet_number;
|
| // If data is associated with the most recent transmission of this
|
| // packet, then inform the caller.
|
| if (it->in_flight) {
|
| @@ -656,7 +656,7 @@
|
| MarkForRetransmission(packet_number, TLP_RETRANSMISSION);
|
| return true;
|
| }
|
| - QUIC_DLOG(ERROR)
|
| + DLOG(ERROR)
|
| << "No retransmittable packets, so RetransmitOldestPacket failed.";
|
| return false;
|
| }
|
| @@ -764,12 +764,12 @@
|
| if (!FLAGS_quic_reloadable_flag_quic_allow_large_send_deltas &&
|
| send_delta.ToSeconds() > kMaxSendDeltaSeconds) {
|
| // send_delta can be very high if local clock is changed mid-connection.
|
| - QUIC_LOG_FIRST_N(WARNING, 10)
|
| - << "Excessive send delta: " << send_delta.ToSeconds()
|
| - << ", setting to: " << kMaxSendDeltaSeconds
|
| - << " largest_observed:" << ack_frame.largest_observed
|
| - << " ack_receive_time:" << ack_receive_time.ToDebuggingValue()
|
| - << " sent_time:" << transmission_info.sent_time.ToDebuggingValue();
|
| + LOG(WARNING) << "Excessive send delta: " << send_delta.ToSeconds()
|
| + << ", setting to: " << kMaxSendDeltaSeconds
|
| + << " largest_observed:" << ack_frame.largest_observed
|
| + << " ack_receive_time:" << ack_receive_time.ToDebuggingValue()
|
| + << " sent_time:"
|
| + << transmission_info.sent_time.ToDebuggingValue();
|
| return false;
|
| }
|
| rtt_stats_.UpdateRtt(send_delta, ack_frame.ack_delay_time, ack_receive_time);
|
|
|