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

webrtc/base/sslstreamadapter.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #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 {
 
 // TODO(guoweis): Move this to SDP layer and use int form internally.
 // webrtc:5043.
 const char CS_AES_CM_128_HMAC_SHA1_80[] = "AES_CM_128_HMAC_SHA1_80";
 const char CS_AES_CM_128_HMAC_SHA1_32[] = "AES_CM_128_HMAC_SHA1_32";
 const char CS_AEAD_AES_128_GCM[] = "AEAD_AES_128_GCM";
 const char CS_AEAD_AES_256_GCM[] = "AEAD_AES_256_GCM";
@@ skipping 64 matching lines @@
 }
 
 // static
 CryptoOptions CryptoOptions::NoGcm() {
   CryptoOptions options;
   options.enable_gcm_crypto_suites = false;
   return options;
 }
 
 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)
     : StreamAdapterInterface(stream),
       ignore_bad_cert_(false),
       client_auth_enabled_(true) {}
 
 SSLStreamAdapter::~SSLStreamAdapter() {}
 
 bool SSLStreamAdapter::GetSslCipherSuite(int* cipher_suite) {
@@ skipping 11 matching lines @@
 
 bool SSLStreamAdapter::SetDtlsSrtpCryptoSuites(
     const std::vector<int>& crypto_suites) {
   return false;
 }
 
 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();
 }
 bool SSLStreamAdapter::IsAcceptableCipher(int cipher, KeyType key_type) {
   return OpenSSLStreamAdapter::IsAcceptableCipher(cipher, key_type);
 }
 bool SSLStreamAdapter::IsAcceptableCipher(const std::string& cipher,
                                           KeyType key_type) {
   return OpenSSLStreamAdapter::IsAcceptableCipher(cipher, key_type);
 }
 std::string SSLStreamAdapter::SslCipherSuiteToName(int cipher_suite) {
   return OpenSSLStreamAdapter::SslCipherSuiteToName(cipher_suite);
 }
 void SSLStreamAdapter::enable_time_callback_for_testing() {
   OpenSSLStreamAdapter::enable_time_callback_for_testing();
 }
-#endif  // SSL_USE_OPENSSL
 
 ///////////////////////////////////////////////////////////////////////////////
 
 }  // namespace rtc