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

net/quic/core/crypto/aead_base_encrypter.h

 // Copyright (c) 2013 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_AEAD_BASE_ENCRYPTER_H_
 #define NET_QUIC_CORE_CRYPTO_AEAD_BASE_ENCRYPTER_H_
 
 #include <cstddef>
 
 #include "base/compiler_specific.h"
@@ skipping 10 matching lines @@
   AeadBaseEncrypter(const EVP_AEAD* aead_alg,
                     size_t key_size,
                     size_t auth_tag_size,
                     size_t nonce_prefix_size);
   ~AeadBaseEncrypter() override;
 
   // QuicEncrypter implementation
   bool SetKey(base::StringPiece key) override;
   bool SetNoncePrefix(base::StringPiece nonce_prefix) override;
   bool EncryptPacket(QuicVersion version,
-                     QuicPathId path_id,
                      QuicPacketNumber packet_number,
                      base::StringPiece associated_data,
                      base::StringPiece plaintext,
                      char* output,
                      size_t* output_length,
                      size_t max_output_length) override;
   size_t GetKeySize() const override;
   size_t GetNoncePrefixSize() const override;
   size_t GetMaxPlaintextSize(size_t ciphertext_size) const override;
   size_t GetCiphertextSize(size_t plaintext_size) const override;
@@ skipping 26 matching lines @@
   unsigned char nonce_prefix_[kMaxNoncePrefixSize];
 
   ScopedEVPAEADCtx ctx_;
 
   DISALLOW_COPY_AND_ASSIGN(AeadBaseEncrypter);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CORE_CRYPTO_AEAD_BASE_ENCRYPTER_H_