Relanding: Removing #defines previously used for building without BoringSSL/OpenSSL.

webrtc/base/sslstreamadapter.cc

Index: webrtc/base/sslstreamadapter.cc
diff --git a/webrtc/base/sslstreamadapter.cc b/webrtc/base/sslstreamadapter.cc
index c3ef3bc3aefa5e39ab4792f7d3f767a972cb8dcb..2f601c625791b4ee1f152bf7a39b33ab62bc7f2e 100644
--- a/webrtc/base/sslstreamadapter.cc
+++ b/webrtc/base/sslstreamadapter.cc
@@ -9,14 +9,9 @@
  */
 
 #include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/sslconfig.h"
-
-#if SSL_USE_OPENSSL
 
 #include "webrtc/base/opensslstreamadapter.h"
 
-#endif  // SSL_USE_OPENSSL
-
 ///////////////////////////////////////////////////////////////////////////////
 
 namespace rtc {
@@ -101,11 +96,7 @@ CryptoOptions CryptoOptions::NoGcm() {
 }
 
 SSLStreamAdapter* SSLStreamAdapter::Create(StreamInterface* stream) {
-#if SSL_USE_OPENSSL
   return new OpenSSLStreamAdapter(stream);
-#else  // !SSL_USE_OPENSSL
-  return NULL;
-#endif  // SSL_USE_OPENSSL
 }
 
 SSLStreamAdapter::SSLStreamAdapter(StreamInterface* stream)
@@ -137,16 +128,6 @@ bool SSLStreamAdapter::GetDtlsSrtpCryptoSuite(int* crypto_suite) {
   return false;
 }
 
-#if SSL_USE_OPENSSL
-bool SSLStreamAdapter::HaveDtls() {
-  return OpenSSLStreamAdapter::HaveDtls();
-}
-bool SSLStreamAdapter::HaveDtlsSrtp() {
-  return OpenSSLStreamAdapter::HaveDtlsSrtp();
-}
-bool SSLStreamAdapter::HaveExporter() {
-  return OpenSSLStreamAdapter::HaveExporter();
-}
 bool SSLStreamAdapter::IsBoringSsl() {
   return OpenSSLStreamAdapter::IsBoringSsl();
 }
@@ -163,7 +144,6 @@ std::string SSLStreamAdapter::SslCipherSuiteToName(int cipher_suite) {
 void SSLStreamAdapter::enable_time_callback_for_testing() {
   OpenSSLStreamAdapter::enable_time_callback_for_testing();
 }
-#endif  // SSL_USE_OPENSSL
 
 ///////////////////////////////////////////////////////////////////////////////