Land Recent QUIC changes

net/quic/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/crypto/null_decrypter.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/quic_data_reader.h"
 
 using base::StringPiece;
 using std::string;
 
 namespace net {
 
-bool NullDecrypter::SetKey(StringPiece key) {
-  return key.empty();
-}
+bool NullDecrypter::SetKey(StringPiece key) { return key.empty(); }
 
 bool NullDecrypter::SetNoncePrefix(StringPiece nonce_prefix) {
   return nonce_prefix.empty();
 }
 
 bool NullDecrypter::Decrypt(StringPiece /*nonce*/,
                             StringPiece associated_data,
                             StringPiece ciphertext,
                             unsigned char* output,
                             size_t* output_length) {
@@ skipping 35 matching lines @@
   // TODO(rch): avoid buffer copy here
   string buffer = associated_data.as_string();
   plaintext.AppendToString(&buffer);
 
   if (hash != QuicUtils::FNV1a_128_Hash(buffer.data(), buffer.length())) {
     return NULL;
   }
   return new QuicData(plaintext.data(), plaintext.length());
 }
 
-StringPiece NullDecrypter::GetKey() const {
-  return StringPiece();
-}
+StringPiece NullDecrypter::GetKey() const { return StringPiece(); }
 
-StringPiece NullDecrypter::GetNoncePrefix() const {
-  return StringPiece();
-}
+StringPiece NullDecrypter::GetNoncePrefix() const { return StringPiece(); }
 
 }  // namespace net