Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(517)

Unified Diff: net/socket/ssl_client_socket_openssl_unittest.cc

Issue 206453002: Introduce USE_OPENSSL_CERTS for certificate handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/socket/ssl_client_socket_openssl_unittest.cc
diff --git a/net/socket/ssl_client_socket_openssl_unittest.cc b/net/socket/ssl_client_socket_openssl_unittest.cc
index 48a4813f1598069ebd28e27d02b57f9374f01850..ee25de67e89491c0618ab29c4501f53aff7bf4bd 100644
--- a/net/socket/ssl_client_socket_openssl_unittest.cc
+++ b/net/socket/ssl_client_socket_openssl_unittest.cc
@@ -61,7 +61,7 @@ typedef crypto::ScopedOpenSSL<RSA, RSA_free> ScopedRSA;
typedef crypto::ScopedOpenSSL<BIGNUM, BN_free> ScopedBIGNUM;
const SSLConfig kDefaultSSLConfig;
-
+#if defined(USE_OPENSSL_CERTS) || defined(OS_ANDROID)
wtc 2014/03/20 21:14:56 Why do you need to comment out this code?
haavardm 2014/03/21 13:08:21 Thanks, I think I got this wrong. It should probab
// A ServerBoundCertStore that always returns an error when asked for a
// certificate.
class FailingServerBoundCertStore : public ServerBoundCertStore {
@@ -360,6 +360,6 @@ TEST_F(SSLClientSocketOpenSSLClientAuthTest, FailingChannelID) {
EXPECT_EQ(ERR_UNEXPECTED, rv);
EXPECT_FALSE(sock_->IsConnected());
}
-
+#endif // defined(USE_OPENSSL_CERTS) || defined(OS_ANDROID)
} // namespace
} // namespace net

Powered by Google App Engine
This is Rietveld 408576698