Landing Recent QUIC changes until Fri May 12 18:23:26 2017 +0000

net/quic/core/congestion_control/send_algorithm_test.cc

Index: net/quic/core/congestion_control/send_algorithm_test.cc
diff --git a/net/quic/core/congestion_control/send_algorithm_test.cc b/net/quic/core/congestion_control/send_algorithm_test.cc
index 134b2de9c51eae5b8ef6e8bb77efc779b4fbf0bb..c2d6632028ca79f4fe21a5a7f9cbec5ce037e36a 100644
--- a/net/quic/core/congestion_control/send_algorithm_test.cc
+++ b/net/quic/core/congestion_control/send_algorithm_test.cc
@@ -232,7 +232,13 @@ class SendAlgorithmTest : public QuicTestWithParam<TestParams> {
     SetExperimentalOptionsInServerConfig();
 
     QuicConnectionPeer::SetSendAlgorithm(quic_sender_.connection(), sender_);
-
+    // TODO(jokulik):  Remove once b/38032710 is fixed.
+    // Disable pacing for PCC.
+    if (sender_->GetCongestionControlType() == kPCC) {
+      QuicSentPacketManagerPeer::SetUsingPacing(
+          QuicConnectionPeer::GetSentPacketManager(quic_sender_.connection()),
+          false);
+    }
     clock_ = simulator_.GetClock();
     simulator_.set_random_generator(&random_);