Landing Recent QUIC changes until 12:43 PM, Nov 5, 2016 UTC+8

net/quic/core/quic_crypto_stream_test.cc

Index: net/quic/core/quic_crypto_stream_test.cc
diff --git a/net/quic/core/quic_crypto_stream_test.cc b/net/quic/core/quic_crypto_stream_test.cc
index 21774d900f9465fd338238db06a38a89e7b5f1d9..3fdf56531ea9178711e152f4c382ea8ecfc9ac15 100644
--- a/net/quic/core/quic_crypto_stream_test.cc
+++ b/net/quic/core/quic_crypto_stream_test.cc
@@ -13,8 +13,8 @@
 #include "net/quic/core/crypto/crypto_handshake.h"
 #include "net/quic/core/crypto/crypto_protocol.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
+#include "net/quic/test_tools/quic_stream_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
-#include "net/quic/test_tools/reliable_quic_stream_peer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -105,8 +105,8 @@ TEST_F(QuicCryptoStreamTest, ProcessBadData) {
 }
 
 TEST_F(QuicCryptoStreamTest, NoConnectionLevelFlowControl) {
-  EXPECT_FALSE(ReliableQuicStreamPeer::StreamContributesToConnectionFlowControl(
-      &stream_));
+  EXPECT_FALSE(
+      QuicStreamPeer::StreamContributesToConnectionFlowControl(&stream_));
 }
 
 }  // namespace