Index: ios/crnet/crnet_environment.mm |
diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm |
index b564111b6094572c861928c7b957db95a43e6b0a..2cb28428445a39243cfe5e4fc6671177b7873e25 100644 |
--- a/ios/crnet/crnet_environment.mm |
+++ b/ios/crnet/crnet_environment.mm |
@@ -154,14 +154,6 @@ void CrNetEnvironment::Initialize() { |
url::Initialize(); |
base::CommandLine::Init(0, nullptr); |
-#if defined(USE_NSS_VERIFIER) |
- // This needs to happen on the main thread. NSPR's initialization sets up its |
- // memory allocator; if this is not done before other threads are created, |
- // this initialization can race to cause accidental free/allocation |
- // mismatches. |
- crypto::EnsureNSPRInit(); |
-#endif |
- |
// Without doing this, StatisticsRecorder::FactoryGet() leaks one histogram |
// per call after the first for a given name. |
base::StatisticsRecorder::Initialize(); |
@@ -292,9 +284,6 @@ void CrNetEnvironment::Install() { |
proxy_config_service_ = net::ProxyService::CreateSystemProxyConfigService( |
network_io_thread_->task_runner(), nullptr); |
-#if defined(USE_NSS_VERIFIER) |
- net::SetURLRequestContextForNSSHttpIO(main_context_.get()); |
-#endif |
main_context_getter_ = new CrNetURLRequestContextGetter( |
main_context_.get(), network_io_thread_->task_runner()); |
base::subtle::MemoryBarrier(); |
@@ -312,9 +301,6 @@ void CrNetEnvironment::InstallIntoSessionConfiguration( |
CrNetEnvironment::~CrNetEnvironment() { |
net::HTTPProtocolHandlerDelegate::SetInstance(nullptr); |
-#if defined(USE_NSS_VERIFIER) |
- net::SetURLRequestContextForNSSHttpIO(nullptr); |
-#endif |
} |
net::URLRequestContextGetter* CrNetEnvironment::GetMainContextGetter() { |