summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-23 23:37:09 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-23 23:37:09 +0000
commit9cf4545bf0f6499f2ad86831d72a81658d0f397d (patch)
tree15d83192806475579b0d93b407e3ea8a6378a9bb /net/socket
parent3b288e9e956a5eb8d442dd15c1566b124b0c2937 (diff)
downloadchromium_src-9cf4545bf0f6499f2ad86831d72a81658d0f397d.zip
chromium_src-9cf4545bf0f6499f2ad86831d72a81658d0f397d.tar.gz
chromium_src-9cf4545bf0f6499f2ad86831d72a81658d0f397d.tar.bz2
Revert "Linux: temp change to see if the builders are getting the wrong headers."
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/ssl_client_socket_nss.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index 9f67666..c013ed8 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -312,8 +312,6 @@ int SSLClientSocketNSS::InitializeSSLOptions() {
rv = SSL_OptionSet(nss_fd_, SSL_ENABLE_DEFLATE, PR_TRUE);
if (rv != SECSuccess)
LOG(INFO) << "SSL_ENABLE_DEFLATE failed. Old system nss?";
-#else
-#error This is a test to see if the builders are picking up the wrong NSS headers. It will already have been reverted by the time that you see this.
#endif
#ifdef SSL_NEXT_PROTO_NEGOTIATED