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

net/quic/crypto/aes_128_gcm_12_decrypter_test.cc

Index: net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
diff --git a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
index 5bcc35579360dad8f7b11b3712b159cd85c11016..d0e5304e97743302b649d10d429c5ea9ec64b839 100644
--- a/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
+++ b/net/quic/crypto/aes_128_gcm_12_decrypter_test.cc
@@ -206,11 +206,9 @@ QuicData* DecryptWithNonce(Aes128Gcm12Decrypter* 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(