| Index: net/test/embedded_test_server/embedded_test_server_unittest.cc
 | 
| diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc
 | 
| index a08d3b7e25416ed1057f4477837dbb3547b5066a..bdd4a826d04bfc24c81151bbbbd3c8600116b112 100644
 | 
| --- a/net/test/embedded_test_server/embedded_test_server_unittest.cc
 | 
| +++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc
 | 
| @@ -30,7 +30,7 @@
 | 
|  #include "net/url_request/url_request_test_util.h"
 | 
|  #include "testing/gtest/include/gtest/gtest.h"
 | 
|  
 | 
| -#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 | 
| +#if defined(USE_NSS_VERIFIER)
 | 
|  #include "net/cert_net/nss_ocsp.h"
 | 
|  #endif
 | 
|  
 | 
| @@ -122,7 +122,7 @@ class EmbeddedTestServerTest
 | 
|    }
 | 
|  
 | 
|    void SetUp() override {
 | 
| -#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 | 
| +#if defined(USE_NSS_VERIFIER)
 | 
|      // This is needed so NSS's HTTP client functions are initialized on the
 | 
|      // right thread. These tests create SSLClientSockets on a different thread.
 | 
|      // TODO(davidben): Initialization can't be deferred to SSLClientSocket. See
 | 
| @@ -145,7 +145,7 @@ class EmbeddedTestServerTest
 | 
|    void TearDown() override {
 | 
|      if (server_->Started())
 | 
|        ASSERT_TRUE(server_->ShutdownAndWaitUntilComplete());
 | 
| -#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 | 
| +#if defined(USE_NSS_VERIFIER)
 | 
|      ShutdownNSSHttpIO();
 | 
|  #endif
 | 
|    }
 | 
| @@ -496,7 +496,7 @@ typedef std::tr1::tuple<bool, bool, EmbeddedTestServer::Type>
 | 
|  class EmbeddedTestServerThreadingTest
 | 
|      : public testing::TestWithParam<ThreadingTestParams> {
 | 
|    void SetUp() override {
 | 
| -#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 | 
| +#if defined(USE_NSS_VERIFIER)
 | 
|      // This is needed so NSS's HTTP client functions are initialized on the
 | 
|      // right thread. These tests create SSLClientSockets on a different thread.
 | 
|      // TODO(davidben): Initialization can't be deferred to SSLClientSocket. See
 | 
| @@ -507,7 +507,7 @@ class EmbeddedTestServerThreadingTest
 | 
|    }
 | 
|  
 | 
|    void TearDown() override {
 | 
| -#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 | 
| +#if defined(USE_NSS_VERIFIER)
 | 
|      ShutdownNSSHttpIO();
 | 
|  #endif
 | 
|    }
 | 
| 
 |