Index: net/socket/ssl_server_socket_unittest.cc |
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc |
index 7327586d37c18ba44c7545a6f9d6775e80c3128a..d60b0f94f3552a10f210dcaf11f4ae16001e5666 100644 |
--- a/net/socket/ssl_server_socket_unittest.cc |
+++ b/net/socket/ssl_server_socket_unittest.cc |
@@ -65,11 +65,9 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
#include "testing/platform_test.h" |
-#if defined(USE_OPENSSL) |
#include <openssl/evp.h> |
#include <openssl/ssl.h> |
#include <openssl/x509.h> |
-#endif |
namespace net { |
@@ -396,7 +394,6 @@ class SSLServerSocketTest : public PlatformTest { |
ASSERT_TRUE(server_socket_); |
} |
-#if defined(USE_OPENSSL) |
void ConfigureClientCertsForClient(const char* cert_file_name, |
const char* private_key_file_name) { |
client_ssl_config_.send_client_cert = true; |
@@ -455,7 +452,6 @@ class SSLServerSocketTest : public PlatformTest { |
crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_vector)); |
return key; |
} |
-#endif |
scoped_ptr<FakeDataChannel> channel_1_; |
scoped_ptr<FakeDataChannel> channel_2_; |
@@ -517,9 +513,6 @@ TEST_F(SSLServerSocketTest, Handshake) { |
EXPECT_TRUE(is_aead); |
} |
-// NSS ports don't support client certificates and have a global session cache. |
-#if defined(USE_OPENSSL) |
- |
// This test makes sure the session cache is working. |
TEST_F(SSLServerSocketTest, HandshakeCached) { |
ASSERT_NO_FATAL_FAILURE(CreateContext()); |
@@ -862,7 +855,6 @@ TEST_F(SSLServerSocketTest, HandshakeWithWrongClientCertSuppliedCached) { |
EXPECT_EQ(ERR_BAD_SSL_CLIENT_AUTH_CERT, |
handshake_callback2.GetResult(server_ret2)); |
} |
-#endif // defined(USE_OPENSSL) |
TEST_F(SSLServerSocketTest, DataTransfer) { |
ASSERT_NO_FATAL_FAILURE(CreateContext()); |