Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: ios/crnet/crnet_environment.mm

Issue 1808963004: Adding macro to enable changing SSL library (Part 1) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove remoting_nacl change. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/ios_chrome_io_thread.mm ('k') | ios/web/app/web_main_loop.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/crnet/crnet_environment.mm
diff --git a/ios/crnet/crnet_environment.mm b/ios/crnet/crnet_environment.mm
index 128d76b990e2df48a5e2fe958cd2e7599c2f5072..2dc8d7ffb3ce731ea5874def3809c435177ccc3f 100644
--- a/ios/crnet/crnet_environment.mm
+++ b/ios/crnet/crnet_environment.mm
@@ -153,11 +153,15 @@ void CrNetEnvironment::Initialize() {
CHECK(base::i18n::InitializeICU());
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();
@@ -288,7 +292,9 @@ 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();
@@ -306,7 +312,9 @@ void CrNetEnvironment::InstallIntoSessionConfiguration(
CrNetEnvironment::~CrNetEnvironment() {
net::HTTPProtocolHandlerDelegate::SetInstance(nullptr);
+#if defined(USE_NSS_VERIFIER)
net::SetURLRequestContextForNSSHttpIO(nullptr);
+#endif
}
net::URLRequestContextGetter* CrNetEnvironment::GetMainContextGetter() {
« no previous file with comments | « ios/chrome/browser/ios_chrome_io_thread.mm ('k') | ios/web/app/web_main_loop.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698