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

net/tools/quic/chlo_extractor_test.cc

Index: net/tools/quic/chlo_extractor_test.cc
diff --git a/net/tools/quic/chlo_extractor_test.cc b/net/tools/quic/chlo_extractor_test.cc
index bdce1b81c3a7b030f29d956a698abba733d4c890..299e05d9b0c5de19affbd41b5d895508556d8768 100644
--- a/net/tools/quic/chlo_extractor_test.cc
+++ b/net/tools/quic/chlo_extractor_test.cc
@@ -63,9 +63,9 @@ class ChloExtractorTest : public ::testing::Test {
     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);