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

net/quic/core/crypto/null_decrypter.cc

 // Copyright (c) 2012 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/quic/core/crypto/null_decrypter.h"
 
 #include <cstdint>
 
 #include "net/base/int128.h"
 #include "net/quic/core/quic_data_reader.h"
@@ skipping 20 matching lines @@
   QUIC_BUG << "Should not be called";
   return false;
 }
 
 bool NullDecrypter::SetDiversificationNonce(const DiversificationNonce& nonce) {
   QUIC_BUG << "Should not be called";
   return true;
 }
 
 bool NullDecrypter::DecryptPacket(QuicVersion version,
-                                  QuicPathId /*path_id*/,
                                   QuicPacketNumber /*packet_number*/,
                                   StringPiece associated_data,
                                   StringPiece ciphertext,
                                   char* output,
                                   size_t* output_length,
                                   size_t max_output_length) {
   QuicDataReader reader(ciphertext.data(), ciphertext.length());
   uint128 hash;
 
   if (!ReadHash(&reader, &hash)) {
@@ skipping 56 matching lines @@
   } else {
     correct_hash = QuicUtils::FNV1a_128_Hash_Two(data1, data2);
   }
   uint128 mask = MakeUint128(UINT64_C(0x0), UINT64_C(0xffffffff));
   mask <<= 96;
   correct_hash &= ~mask;
   return correct_hash;
 }
 
 }  // namespace net