Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / net / quic / crypto / quic_encrypter.h

diff --git a/src/net/quic/crypto/quic_encrypter.h b/src/net/quic/crypto/quic_encrypter.h
index edddf36..5cb40a1 100644 (file)
--- a/src/net/quic/crypto/quic_encrypter.h
+++ b/src/net/quic/crypto/quic_encrypter.h
@@ -6,7 +6,6 @@
 #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 {
@@ -52,7 +51,7 @@ class NET_EXPORT_PRIVATE QuicEncrypter {
 
   // Returns a newly created QuicData object containing the encrypted
   // |plaintext| as well as a MAC over both |plaintext| and |associated_data|,
-  // or NULL if there is an error. |sequence_number| is appended to the
+  // or nullptr if there is an error. |sequence_number| is appended to the
   // |nonce_prefix| value provided in SetNoncePrefix() to form the nonce.
   virtual QuicData* EncryptPacket(QuicPacketSequenceNumber sequence_number,
                                   base::StringPiece associated_data,