Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index 2641088eaa252258839b0a9a4b8bf22794e156d7..097e8a67ddc54ddc1b8c0879683e4bc0dbb0ec82 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 |
} |
@@ -626,7 +626,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 |
@@ -898,7 +898,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 |