Landing Recent QUIC changes until Sun Apr 9 16:12:55

net/quic/core/congestion_control/send_algorithm_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <map>
 #include <memory>
 
 #include "net/quic/core/congestion_control/rtt_stats.h"
 #include "net/quic/core/congestion_control/send_algorithm_interface.h"
@@ skipping 199 matching lines @@
       : simulator_(),
         quic_sender_(&simulator_,
                      "QUIC sender",
                      "Receiver",
                      Perspective::IS_CLIENT,
                      42),
         receiver_(&simulator_,
                   "Receiver",
                   "QUIC sender",
                   Perspective::IS_SERVER,
-                  42) {
+                  net::test::GetPeerInMemoryConnectionId(42)) {
     rtt_stats_ = quic_sender_.connection()->sent_packet_manager().GetRttStats();
     sender_ = SendAlgorithmInterface::Create(
         simulator_.GetClock(), rtt_stats_,
         QuicSentPacketManagerPeer::GetUnackedPacketMap(
             QuicConnectionPeer::GetSentPacketManager(
                 quic_sender_.connection())),
         GetParam().congestion_control_type, &random_, &stats_,
         kInitialCongestionWindowPackets);
 
     SetExperimentalOptionsInServerConfig();
@@ skipping 211 matching lines @@
   const QuicTime::Delta maximum_elapsed_time =
       EstimatedElapsedTime(kTransferSizeBytes, kTestLinkWiredBandwidth,
                            kTestLinkSmallRTTDelay) *
       1.2;
   DoSimpleTransfer(kTransferSizeBytes, maximum_elapsed_time);
   PrintTransferStats();
 }
 
 }  // namespace test
 }  // namespace net