Landing Recent QUIC changes until 2016-03-15 16:26 UTC

net/quic/crypto/chacha20_poly1305_rfc7539_decrypter_test.cc

Index: net/quic/crypto/chacha20_poly1305_rfc7539_decrypter_test.cc
diff --git a/net/quic/crypto/chacha20_poly1305_rfc7539_decrypter_test.cc b/net/quic/crypto/chacha20_poly1305_rfc7539_decrypter_test.cc
index 8a92e63171a3ab095658b9e22b18c8b99b9a493b..3acc1fcb518d42e895f67a52480361f6c315e9d2 100644
--- a/net/quic/crypto/chacha20_poly1305_rfc7539_decrypter_test.cc
+++ b/net/quic/crypto/chacha20_poly1305_rfc7539_decrypter_test.cc
@@ -120,11 +120,9 @@ QuicData* DecryptWithNonce(ChaCha20Poly1305Rfc7539Decrypter* decrypter,
   decrypter->SetNoncePrefix(nonce_prefix);
   memcpy(&packet_number, nonce.data() + nonce_prefix.size(),
          sizeof(packet_number));
-  if (FLAGS_quic_include_path_id_in_iv) {
-    path_id = static_cast<QuicPathId>(
-        packet_number >> 8 * (sizeof(packet_number) - sizeof(path_id)));
-    packet_number &= UINT64_C(0x00FFFFFFFFFFFFFF);
-  }
+  path_id = static_cast<QuicPathId>(
+      packet_number >> 8 * (sizeof(packet_number) - sizeof(path_id)));
+  packet_number &= UINT64_C(0x00FFFFFFFFFFFFFF);
   scoped_ptr<char[]> output(new char[ciphertext.length()]);
   size_t output_length = 0;
   const bool success = decrypter->DecryptPacket(