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

net/quic/core/crypto/null_encrypter.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_encrypter.h"
 
 #include "net/quic/core/quic_data_writer.h"
 #include "net/quic/core/quic_utils.h"
 
 using base::StringPiece;
 using std::string;
 
 namespace net {
 
 const size_t kHashSizeShort = 12;  // size of uint128 serialized short
 
 NullEncrypter::NullEncrypter(Perspective perspective)
     : perspective_(perspective) {}
 
 bool NullEncrypter::SetKey(StringPiece key) {
   return key.empty();
 }
 
 bool NullEncrypter::SetNoncePrefix(StringPiece nonce_prefix) {
   return nonce_prefix.empty();
 }
 
 bool NullEncrypter::EncryptPacket(QuicVersion version,
-                                  QuicPathId /*path_id*/,
                                   QuicPacketNumber /*packet_number*/,
                                   StringPiece associated_data,
                                   StringPiece plaintext,
                                   char* output,
                                   size_t* output_length,
                                   size_t max_output_length) {
   const size_t len = plaintext.size() + GetHashLength();
   if (max_output_length < len) {
     return false;
   }
@@ skipping 40 matching lines @@
 
 StringPiece NullEncrypter::GetNoncePrefix() const {
   return StringPiece();
 }
 
 size_t NullEncrypter::GetHashLength() const {
   return kHashSizeShort;
 }
 
 }  // namespace net