Land Recent QUIC changes

net/quic/crypto/quic_encrypter.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_CRYPTO_QUIC_ENCRYPTER_H_
 #define NET_QUIC_CRYPTO_QUIC_ENCRYPTER_H_
 
 #include "net/base/net_export.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/quic_protocol.h"
 
 namespace net {
 
 class NET_EXPORT_PRIVATE QuicEncrypter {
  public:
   virtual ~QuicEncrypter() {}
 
-  static QuicEncrypter* Create(CryptoTag algorithm);
+  static QuicEncrypter* Create(QuicTag algorithm);
 
   // Sets the encryption key. Returns true on success, false on failure.
   //
   // NOTE: The key is the client_write_key or server_write_key derived from
   // the master secret.
   virtual bool SetKey(base::StringPiece key) = 0;
 
   // Sets the fixed initial bytes of the nonce. Returns true on success,
   // false on failure.
   //
@@ skipping 49 matching lines @@
   virtual size_t GetCiphertextSize(size_t plaintext_size) const = 0;
 
   // For use by unit tests only.
   virtual base::StringPiece GetKey() const = 0;
   virtual base::StringPiece GetNoncePrefix() const = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_QUIC_ENCRYPTER_H_