Removing NSS files and USE_OPENSSL flag

net/quic/crypto/p256_key_exchange.h

Index: net/quic/crypto/p256_key_exchange.h
diff --git a/net/quic/crypto/p256_key_exchange.h b/net/quic/crypto/p256_key_exchange.h
index 197adfe557c53d4d4cd90bee647e0a40af5b5326..b6eb303246b91bea8f23f74db0660c6e7fa6a1e6 100644
--- a/net/quic/crypto/p256_key_exchange.h
+++ b/net/quic/crypto/p256_key_exchange.h
@@ -15,13 +15,8 @@
 #include "net/base/net_export.h"
 #include "net/quic/crypto/key_exchange.h"
 
-#if defined(USE_OPENSSL)
 #include "crypto/openssl_util.h"
 #include "crypto/scoped_openssl_types.h"

[Ryan Sleevi, 2016/04/18 14:23:30]

Fix sorting

[svaldez, 2016/04/18 15:09:35]

Done.

-#else
-#include "crypto/ec_private_key.h"
-#include "crypto/scoped_nss_types.h"
-#endif
 
 namespace net {
 
@@ -59,19 +54,11 @@ class NET_EXPORT_PRIVATE P256KeyExchange : public KeyExchange {
     kUncompressedECPointForm = 0x04,
   };
 
-#if defined(USE_OPENSSL)
   // P256KeyExchange takes ownership of |private_key|, and expects
   // |public_key| consists of |kUncompressedP256PointBytes| bytes.
   P256KeyExchange(EC_KEY* private_key, const uint8_t* public_key);
 
   crypto::ScopedEC_KEY private_key_;
-#else
-  // P256KeyExchange takes ownership of |key_pair|, and expects
-  // |public_key| consists of |kUncompressedP256PointBytes| bytes.
-  P256KeyExchange(crypto::ECPrivateKey* key_pair, const uint8_t* public_key);
-
-  scoped_ptr<crypto::ECPrivateKey> key_pair_;
-#endif
   // The public key stored as an uncompressed P-256 point.
   uint8_t public_key_[kUncompressedP256PointBytes];