QUIC - cleanup changes to keep in sync with internal source tree.

net/quic/crypto/crypto_server_test.cc

Index: net/quic/crypto/crypto_server_test.cc
diff --git a/net/quic/crypto/crypto_server_test.cc b/net/quic/crypto/crypto_server_test.cc
index 7cb7e990fa240e6bc68cb76196e02f66a7df9410..db85a4c63134d3099f1eed68ee5b56caa31ce620 100644
--- a/net/quic/crypto/crypto_server_test.cc
+++ b/net/quic/crypto/crypto_server_test.cc
@@ -270,9 +270,9 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
   void CheckRejectReasons(
       const HandshakeFailureReason* expected_handshake_failures,
       size_t expected_count) {
-    const QuicTag* reject_reason_tags;
+    const uint32* reject_reasons;

[wtc, 2014/06/20 23:21:01]

We should also COMPILE_ASSERT sizeof(QuicTag) == sizeof(uint32) here.

[ramant (doing other things), 2014/06/20 23:33:25]

Done.

     size_t num_reject_reasons;
-    QuicErrorCode error_code = out_.GetTaglist(kRREJ, &reject_reason_tags,
+    QuicErrorCode error_code = out_.GetTaglist(kRREJ, &reject_reasons,
                                                &num_reject_reasons);
     if (!FLAGS_send_quic_crypto_reject_reason) {
       ASSERT_EQ(QUIC_CRYPTO_MESSAGE_PARAMETER_NOT_FOUND, error_code);
@@ -286,7 +286,7 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
       EXPECT_EQ(expected_count, num_reject_reasons);
     }
     for (size_t i = 0; i < num_reject_reasons; ++i) {
-      EXPECT_EQ(expected_handshake_failures[i], reject_reason_tags[i]);
+      EXPECT_EQ(expected_handshake_failures[i], reject_reasons[i]);
     }
   }