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

net/quic/core/crypto/null_encrypter_test.cc

Index: net/quic/core/crypto/null_encrypter_test.cc
diff --git a/net/quic/core/crypto/null_encrypter_test.cc b/net/quic/core/crypto/null_encrypter_test.cc
index e0296e4915b42cac59bd8c14a733c1c6219ca110..d875e0e7dc998b0e9f9fc9582709417562e96162 100644
--- a/net/quic/core/crypto/null_encrypter_test.cc
+++ b/net/quic/core/crypto/null_encrypter_test.cc
@@ -22,9 +22,9 @@ TEST_F(NullEncrypterTest, EncryptClient) {
   char encrypted[256];
   size_t encrypted_len = 0;
   NullEncrypter encrypter(Perspective::IS_CLIENT);
-  ASSERT_TRUE(encrypter.EncryptPacket(QUIC_VERSION_37, kDefaultPathId, 0,
-                                      "hello world!", "goodbye!", encrypted,
-                                      &encrypted_len, 256));
+  ASSERT_TRUE(encrypter.EncryptPacket(QUIC_VERSION_37, 0, "hello world!",
+                                      "goodbye!", encrypted, &encrypted_len,
+                                      256));
   test::CompareCharArraysWithHexError(
       "encrypted data", encrypted, encrypted_len,
       reinterpret_cast<const char*>(expected), arraysize(expected));
@@ -40,9 +40,9 @@ TEST_F(NullEncrypterTest, EncryptServer) {
   char encrypted[256];
   size_t encrypted_len = 0;
   NullEncrypter encrypter(Perspective::IS_SERVER);
-  ASSERT_TRUE(encrypter.EncryptPacket(QUIC_VERSION_37, kDefaultPathId, 0,
-                                      "hello world!", "goodbye!", encrypted,
-                                      &encrypted_len, 256));
+  ASSERT_TRUE(encrypter.EncryptPacket(QUIC_VERSION_37, 0, "hello world!",
+                                      "goodbye!", encrypted, &encrypted_len,
+                                      256));
   test::CompareCharArraysWithHexError(
       "encrypted data", encrypted, encrypted_len,
       reinterpret_cast<const char*>(expected), arraysize(expected));
@@ -58,9 +58,9 @@ TEST_F(NullEncrypterTest, EncryptClientPre37) {
   char encrypted[256];
   size_t encrypted_len = 0;
   NullEncrypter encrypter(Perspective::IS_CLIENT);
-  ASSERT_TRUE(encrypter.EncryptPacket(QUIC_VERSION_36, kDefaultPathId, 0,
-                                      "hello world!", "goodbye!", encrypted,
-                                      &encrypted_len, 256));
+  ASSERT_TRUE(encrypter.EncryptPacket(QUIC_VERSION_36, 0, "hello world!",
+                                      "goodbye!", encrypted, &encrypted_len,
+                                      256));
   test::CompareCharArraysWithHexError(
       "encrypted data", encrypted, encrypted_len,
       reinterpret_cast<const char*>(expected), arraysize(expected));
@@ -76,9 +76,9 @@ TEST_F(NullEncrypterTest, EncryptServerPre37) {
   char encrypted[256];
   size_t encrypted_len = 0;
   NullEncrypter encrypter(Perspective::IS_SERVER);
-  ASSERT_TRUE(encrypter.EncryptPacket(QUIC_VERSION_36, kDefaultPathId, 0,
-                                      "hello world!", "goodbye!", encrypted,
-                                      &encrypted_len, 256));
+  ASSERT_TRUE(encrypter.EncryptPacket(QUIC_VERSION_36, 0, "hello world!",
+                                      "goodbye!", encrypted, &encrypted_len,
+                                      256));
   test::CompareCharArraysWithHexError(
       "encrypted data", encrypted, encrypted_len,
       reinterpret_cast<const char*>(expected), arraysize(expected));