Adding macro to enable changing SSL library (Part 1)

ios/crnet/crnet_environment.mm

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)

[davidben, 2016/03/17 19:48:08]

(I suppose, strictly speaking, this line is also used for the SSL stack and
crypto bits. If we somehow had !USE_OPENSSL and !USE_NSS_VERIFIER, we'd want
this here too. But meh. I don't think it's really worth fussing about.)

[svaldez, 2016/03/17 20:04:18]

Acknowledged.

   // 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() {