Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/tools/quic/stateless_rejector_test.cc

 // Copyright 2016 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/tools/quic/stateless_rejector.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/memory/ptr_util.h"
@@ skipping 85 matching lines @@
         GetParam().flags == ENABLED || GetParam().flags == STATELESS_DISABLED;
 
     // Add a new primary config.
     std::unique_ptr<CryptoHandshakeMessage> msg(config_.AddDefaultConfig(
         QuicRandom::GetInstance(), &clock_, config_options_));
 
     // Save the server config.
     scid_hex_ = "#" + QuicUtils::HexEncode(config_peer_.GetPrimaryConfig()->id);
 
     // Encode the QUIC version.
-    ver_hex_ = QuicUtils::TagToString(QuicVersionToQuicTag(GetParam().version));
+    ver_hex_ = QuicTagToString(QuicVersionToQuicTag(GetParam().version));
 
     // Generate a public value.
     char public_value[32];
     memset(public_value, 42, sizeof(public_value));
     pubs_hex_ = "#" + QuicUtils::HexEncode(public_value, sizeof(public_value));
 
     // Generate a client nonce.
     string nonce;
     CryptoUtils::GenerateNonce(
         clock_.WallNow(), QuicRandom::GetInstance(),
@@ skipping 52 matching lines @@
   // clang-format off
   const CryptoHandshakeMessage client_hello = CryptoTestUtils::Message(
       "CHLO",
       "PDMD", "X509",
       "COPT", "SREJ",
       nullptr);
   // clang-format on
   rejector_->OnChlo(GetParam().version, kConnectionId,
                     kServerDesignateConnectionId, client_hello);
 
-  if (GetParam().flags != ENABLED || GetParam().version <= QUIC_VERSION_32) {
+  if (GetParam().flags != ENABLED) {
     EXPECT_EQ(StatelessRejector::UNSUPPORTED, rejector_->state());
     return;
   }
 
   // The StatelessRejector is undecided - proceed with async processing
   ASSERT_EQ(StatelessRejector::UNKNOWN, rejector_->state());
   StatelessRejector::Process(std::move(rejector_),
                              base::MakeUnique<ProcessDoneCallback>(this));
 
   EXPECT_EQ(StatelessRejector::FAILED, rejector_->state());
@@ skipping 31 matching lines @@
       "PUBS", pubs_hex_.c_str(),
       "NONC", nonc_hex_.c_str(),
       "#004b5453", stk_hex_.c_str(),
       "VER\0", ver_hex_.c_str(),
       "$padding", static_cast<int>(kClientHelloMinimumSize),
       nullptr);
   // clang-format on
 
   rejector_->OnChlo(GetParam().version, kConnectionId,
                     kServerDesignateConnectionId, client_hello);
-  if (GetParam().flags != ENABLED || GetParam().version <= QUIC_VERSION_32) {
+  if (GetParam().flags != ENABLED) {
     EXPECT_EQ(StatelessRejector::UNSUPPORTED, rejector_->state());
     return;
   }
 
   // The StatelessRejector is undecided - proceed with async processing
   ASSERT_EQ(StatelessRejector::UNKNOWN, rejector_->state());
   StatelessRejector::Process(std::move(rejector_),
                              base::MakeUnique<ProcessDoneCallback>(this));
 
   ASSERT_EQ(StatelessRejector::REJECTED, rejector_->state());
@@ skipping 25 matching lines @@
       "NONC", nonc_hex_.c_str(),
       "#004b5453", stk_hex_.c_str(),
       "VER\0", ver_hex_.c_str(),
       "XLCT", xlct_hex.c_str(),
       "$padding", static_cast<int>(kClientHelloMinimumSize),
       nullptr);
   // clang-format on
 
   rejector_->OnChlo(GetParam().version, kConnectionId,
                     kServerDesignateConnectionId, client_hello);
-  if (GetParam().flags != ENABLED || GetParam().version <= QUIC_VERSION_32) {
+  if (GetParam().flags != ENABLED) {
     EXPECT_EQ(StatelessRejector::UNSUPPORTED, rejector_->state());
     return;
   }
 
   // The StatelessRejector is undecided - proceed with async processing
   ASSERT_EQ(StatelessRejector::UNKNOWN, rejector_->state());
   StatelessRejector::Process(std::move(rejector_),
                              base::MakeUnique<ProcessDoneCallback>(this));
 
   EXPECT_EQ(StatelessRejector::ACCEPTED, rejector_->state());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net