Update from chromium https://crrev.com/302282

net/tools/quic/end_to_end_test.cc

Index: net/tools/quic/end_to_end_test.cc
diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index abf0babd460a8a833f17168da1b9fc89316b8200..8974a112370fd955c4a645ec8b261c9316336797 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -882,6 +882,7 @@ TEST_P(EndToEndTest, NegotiateMaxOpenStreams) {
 }
 
 TEST_P(EndToEndTest, NegotiateCongestionControl) {
+  ValueRestore<bool> old_flag(&FLAGS_quic_allow_bbr, true);
   ASSERT_TRUE(Initialize());
   client_->client()->WaitForCryptoHandshakeConfirmed();
 
@@ -901,7 +902,7 @@ TEST_P(EndToEndTest, NegotiateCongestionControl) {
   }
 
   EXPECT_EQ(expected_congestion_control_type,
-            QuicSentPacketManagerPeer::GetCongestionControlAlgorithm(
+            QuicSentPacketManagerPeer::GetSendAlgorithm(
                 *GetSentPacketManagerFromFirstServerSession())
             ->GetCongestionControlType());
 }