Land Recent QUIC changes

net/quic/quic_crypto_stream_test.cc

 // Copyright (c) 2012 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 "net/quic/quic_crypto_stream.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 80 matching lines @@
   ASSERT_EQ(1u, stream_.messages()->size());
   const CryptoHandshakeMessage& message = (*stream_.messages())[0];
   EXPECT_EQ(kSHLO, message.tag());
   EXPECT_EQ(2u, message.tag_value_map().size());
   EXPECT_EQ("abc", CryptoTestUtils::GetValueForTag(message, 1));
   EXPECT_EQ("def", CryptoTestUtils::GetValueForTag(message, 2));
 }
 
 TEST_F(QuicCryptoStreamTest, ProcessBadData) {
   string bad(message_data_->data(), message_data_->length());
-  bad[8] = 0x7F;  // out of order tag
+  const int kFirstTagIndex = sizeof(uint32) +  // message tag
+                             sizeof(uint16) +  // number of tag-value pairs
+                             sizeof(uint16);   // padding
+  EXPECT_EQ(1, bad[kFirstTagIndex]);
+  bad[kFirstTagIndex] = 0x7F;  // out of order tag
 
   EXPECT_CALL(*connection_,
               SendConnectionClose(QUIC_CRYPTO_TAGS_OUT_OF_ORDER));
   EXPECT_EQ(0u, stream_.ProcessData(bad.data(), bad.length()));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net