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

net/tools/quic/chlo_extractor_test.cc

 // Copyright (c) 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/chlo_extractor.h"
 
 #include "net/quic/core/quic_framer.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 
@@ skipping 34 matching lines @@
  public:
   ChloExtractorTest() {
     header_.public_header.connection_id = 42;
     header_.public_header.connection_id_length = PACKET_8BYTE_CONNECTION_ID;
     header_.public_header.version_flag = true;
     header_.public_header.versions =
         SupportedVersions(AllSupportedVersions().front());
     header_.public_header.reset_flag = false;
     header_.public_header.packet_number_length = PACKET_6BYTE_PACKET_NUMBER;
     header_.packet_number = 1;
-    header_.entropy_flag = false;
-    header_.entropy_hash = 0;
   }
 
   void MakePacket(QuicStreamFrame* stream_frame) {
     QuicFrame frame(stream_frame);
     QuicFrames frames;
     frames.push_back(frame);
     QuicFramer framer(SupportedVersions(header_.public_header.versions.front()),
                       QuicTime::Zero(), Perspective::IS_CLIENT);
     std::unique_ptr<QuicPacket> packet(
         BuildUnsizedDataPacket(&framer, header_, frames));
@@ skipping 60 matching lines @@
 
 TEST_F(ChloExtractorTest, DoesNotFindInvalidChlo) {
   MakePacket(new QuicStreamFrame(kCryptoStreamId, false, 0, "foo"));
   EXPECT_FALSE(
       ChloExtractor::Extract(*packet_, AllSupportedVersions(), &delegate_));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net