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

net/quic/crypto/crypto_server_test.cc

 // Copyright (c) 2013 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 <ostream>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/strings/string_number_conversions.h"
 #include "crypto/secure_hash.h"
@@ skipping 252 matching lines @@
     CryptoUtils::GenerateNonce(
         clock_.WallNow(), rand_,
         StringPiece(reinterpret_cast<const char*>(orbit_), sizeof(orbit_)),
         &nonce);
     return nonce;
   }
 
   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);
       return;
     }
     ASSERT_EQ(QUIC_NO_ERROR, error_code);
 
     if (FLAGS_use_early_return_when_verifying_chlo) {
       EXPECT_EQ(1u, num_reject_reasons);
     } else {
       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]);
     }
   }
 
  protected:
   QuicRandom* const rand_;
   MockClock clock_;
   const IPEndPoint client_address_;
   QuicVersionVector supported_versions_;
   string client_version_;
   QuicCryptoServerConfig config_;
@@ skipping 417 matching lines @@
 
   strike_register_client_->RunPendingVerifications();
   ASSERT_TRUE(called);
   EXPECT_EQ(0, strike_register_client_->PendingVerifications());
   // The message should be rejected now.
   EXPECT_EQ(kREJ, out_.tag());
 }
 
 }  // namespace test
 }  // namespace net