Removing NSS files and USE_OPENSSL flag

net/quic/crypto/chacha20_poly1305_rfc7539_encrypter.h

Index: net/quic/crypto/chacha20_poly1305_rfc7539_encrypter.h
diff --git a/net/quic/crypto/chacha20_poly1305_rfc7539_encrypter.h b/net/quic/crypto/chacha20_poly1305_rfc7539_encrypter.h
index 7b6e0b4e205776f5fa5601c21981b05b823d4afa..36b1a623752b8647bbb39ef61c5a8fb6b077f84e 100644
--- a/net/quic/crypto/chacha20_poly1305_rfc7539_encrypter.h
+++ b/net/quic/crypto/chacha20_poly1305_rfc7539_encrypter.h
@@ -33,15 +33,6 @@ class NET_EXPORT_PRIVATE ChaCha20Poly1305Rfc7539Encrypter
   // variant of ChaCha20+Poly1305.
   static bool IsSupported();

[davidben, 2016/04/18 19:36:45]

rch: I believe this can go away now.

[Ryan Hamilton, 2016/04/18 21:52:06]

ditto

 
-#if !defined(USE_OPENSSL)
- protected:
-  // AeadBaseEncrypter methods:
-  void FillAeadParams(base::StringPiece nonce,
-                      base::StringPiece associated_data,
-                      size_t auth_tag_size,
-                      AeadParams* aead_params) const override;
-#endif
-
  private:
   DISALLOW_COPY_AND_ASSIGN(ChaCha20Poly1305Rfc7539Encrypter);
 };