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

net/quic/core/crypto/null_decrypter.h

 // 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.
 
 #ifndef NET_QUIC_CORE_CRYPTO_NULL_DECRYPTER_H_
 #define NET_QUIC_CORE_CRYPTO_NULL_DECRYPTER_H_
 
 #include <cstddef>
 #include <cstdint>
 
@@ skipping 15 matching lines @@
  public:
   explicit NullDecrypter(Perspective perspective);
   ~NullDecrypter() override {}
 
   // QuicDecrypter implementation
   bool SetKey(base::StringPiece key) override;
   bool SetNoncePrefix(base::StringPiece nonce_prefix) override;
   bool SetPreliminaryKey(base::StringPiece key) override;
   bool SetDiversificationNonce(const DiversificationNonce& nonce) override;
   bool DecryptPacket(QuicVersion version,
-                     QuicPathId path_id,
                      QuicPacketNumber packet_number,
                      base::StringPiece associated_data,
                      base::StringPiece ciphertext,
                      char* output,
                      size_t* output_length,
                      size_t max_output_length) override;
   base::StringPiece GetKey() const override;
   base::StringPiece GetNoncePrefix() const override;
 
   const char* cipher_name() const override;
   uint32_t cipher_id() const override;
 
  private:
   bool ReadHash(QuicDataReader* reader, uint128* hash);
   uint128 ComputeHash(QuicVersion version,
                       base::StringPiece data1,
                       base::StringPiece data2) const;
 
   Perspective perspective_;
 
   DISALLOW_COPY_AND_ASSIGN(NullDecrypter);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CORE_CRYPTO_NULL_DECRYPTER_H_