| Index: chrome/browser/io_thread.cc
 | 
| diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
 | 
| index cfb9a37833b47cb1fe1274141350e0ec047d0e11..44eb9ccf50f1625d3701128e7798156f9e702bb0 100644
 | 
| --- a/chrome/browser/io_thread.cc
 | 
| +++ b/chrome/browser/io_thread.cc
 | 
| @@ -96,7 +96,7 @@
 | 
|  #include "chrome/browser/extensions/event_router_forwarder.h"
 | 
|  #endif
 | 
|  
 | 
| -#if defined(USE_NSS) || defined(OS_IOS)
 | 
| +#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 | 
|  #include "net/cert_net/nss_ocsp.h"
 | 
|  #endif
 | 
|  
 | 
| @@ -152,7 +152,7 @@ void ObserveKeychainEvents() {
 | 
|  class SystemURLRequestContext : public net::URLRequestContext {
 | 
|   public:
 | 
|    SystemURLRequestContext() {
 | 
| -#if defined(USE_NSS) || defined(OS_IOS)
 | 
| +#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 | 
|      net::SetURLRequestContextForNSSHttpIO(this);
 | 
|  #endif
 | 
|    }
 | 
| @@ -160,7 +160,7 @@ class SystemURLRequestContext : public net::URLRequestContext {
 | 
|   private:
 | 
|    ~SystemURLRequestContext() override {
 | 
|      AssertNoURLRequests();
 | 
| -#if defined(USE_NSS) || defined(OS_IOS)
 | 
| +#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 | 
|      net::SetURLRequestContextForNSSHttpIO(NULL);
 | 
|  #endif
 | 
|    }
 | 
| @@ -627,7 +627,7 @@ void IOThread::InitAsync() {
 | 
|    TRACE_EVENT0("startup", "IOThread::InitAsync");
 | 
|    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 | 
|  
 | 
| -#if defined(USE_NSS) || defined(OS_IOS)
 | 
| +#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 | 
|    net::SetMessageLoopForNSSHttpIO();
 | 
|  #endif
 | 
|  
 | 
| @@ -899,7 +899,7 @@ void IOThread::InitAsync() {
 | 
|  void IOThread::CleanUp() {
 | 
|    base::debug::LeakTracker<SafeBrowsingURLRequestContext>::CheckForLeaks();
 | 
|  
 | 
| -#if defined(USE_NSS) || defined(OS_IOS)
 | 
| +#if defined(USE_NSS_CERTS) || defined(OS_IOS)
 | 
|    net::ShutdownNSSHttpIO();
 | 
|  #endif
 | 
|  
 | 
| 
 |