Landing Recent QUIC changes until Sun Sep 4 03:41:00

net/tools/quic/quic_simple_server_session_helper_test.cc

Index: net/tools/quic/quic_simple_server_session_helper_test.cc
diff --git a/net/tools/quic/quic_simple_server_session_helper_test.cc b/net/tools/quic/quic_simple_server_session_helper_test.cc
index e739ada62dad65e7aee957c79caea676beee5c44..c25c60e54a8ed33b8a1782a415da5087238ffb44 100644
--- a/net/tools/quic/quic_simple_server_session_helper_test.cc
+++ b/net/tools/quic/quic_simple_server_session_helper_test.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "net/tools/quic/quic_simple_server_session_helper.h"
-
 #include "net/quic/test_tools/mock_random.h"
+#include "net/tools/quic/quic_simple_crypto_server_stream_helper.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
-TEST(QuicSimpleServerSessionHelperTest, GenerateConnectionIdForReject) {
+TEST(QuicSimpleCryptoServerStreamHelperTest, GenerateConnectionIdForReject) {
   test::MockRandom random;
-  QuicSimpleServerSessionHelper helper(&random);
+  QuicSimpleCryptoServerStreamHelper helper(&random);
 
   EXPECT_EQ(random.RandUint64(), helper.GenerateConnectionIdForReject(42));
 }