Land Recent QUIC Changes

net/quic/quic_crypto_stream_test.cc

Index: net/quic/quic_crypto_stream_test.cc
diff --git a/net/quic/quic_crypto_stream_test.cc b/net/quic/quic_crypto_stream_test.cc
index 8f8028b5d94b2e688cc4ca502bff1453b769577d..6e465ab396acdf9243a700d7d94509c5377b6ba6 100644
--- a/net/quic/quic_crypto_stream_test.cc
+++ b/net/quic/quic_crypto_stream_test.cc
@@ -74,7 +74,8 @@ class QuicCryptoStreamTest : public ::testing::Test {
 };
 
 TEST_F(QuicCryptoStreamTest, NotInitiallyConected) {
-  EXPECT_FALSE(stream_.handshake_complete());
+  EXPECT_FALSE(stream_.encryption_established());
+  EXPECT_FALSE(stream_.handshake_confirmed());
 }
 
 TEST_F(QuicCryptoStreamTest, OnErrorClosesConnection) {
@@ -97,7 +98,7 @@ TEST_F(QuicCryptoStreamTest, ProcessData) {
 
 TEST_F(QuicCryptoStreamTest, ProcessBadData) {
   string bad(message_data_->data(), message_data_->length());
-  bad[6] = 0x7F;  // out of order tag
+  bad[8] = 0x7F;  // out of order tag
 
   EXPECT_CALL(*connection_,
               SendConnectionClose(QUIC_CRYPTO_TAGS_OUT_OF_ORDER));