Landing Recent QUIC changes until 5:30 PM, Feb 3, 2017 UTC-5

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 45 matching lines @@
 
   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));
     EXPECT_TRUE(packet != nullptr);
-    size_t encrypted_length = framer.EncryptPayload(
-        ENCRYPTION_NONE, header_.path_id, header_.packet_number, *packet,
-        buffer_, arraysize(buffer_));
+    size_t encrypted_length =
+        framer.EncryptPayload(ENCRYPTION_NONE, header_.packet_number, *packet,
+                              buffer_, arraysize(buffer_));
     ASSERT_NE(0u, encrypted_length);
     packet_.reset(new QuicEncryptedPacket(buffer_, encrypted_length));
     EXPECT_TRUE(packet_ != nullptr);
     delete stream_frame;
   }
 
  protected:
   TestDelegate delegate_;
   QuicPacketHeader header_;
   std::unique_ptr<QuicEncryptedPacket> packet_;
@@ skipping 46 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