Chromium Code Reviews| Index: net/ssl/channel_id_service.cc |
| diff --git a/net/ssl/channel_id_service.cc b/net/ssl/channel_id_service.cc |
| index 9bc21794a9c11b70f066fe60ad09aefb3a183587..7fcbc539b32187d0e1abcacc140a62eb88672876 100644 |
| --- a/net/ssl/channel_id_service.cc |
| +++ b/net/ssl/channel_id_service.cc |
| @@ -27,7 +27,7 @@ |
| #include "net/cert/x509_util.h" |
| #include "url/gurl.h" |
| -#if defined(USE_NSS) |
| +#if !defined(USE_OPENSSL) |
| #include <private/pprthred.h> // PR_DetachThread |
| #endif |
| @@ -246,7 +246,7 @@ class ChannelIDServiceWorker { |
| scoped_ptr<ChannelIDStore::ChannelID> cert = |
| GenerateChannelID(server_identifier_, serial_number_, &error); |
| DVLOG(1) << "GenerateCert " << server_identifier_ << " returned " << error; |
| -#if defined(USE_NSS) |
| +#if !defined(USE_OPENSSL) |
|
davidben
2015/02/26 22:59:25
I'm sort of puzzled why this didn't cause problems
Ryan Sleevi
2015/04/20 11:06:17
because we suppress the leaks in our sanitizers ;)
|
| // Detach the thread from NSPR. |
| // Calling NSS functions attaches the thread to NSPR, which stores |
| // the NSPR thread ID in thread-specific data. |