Removing NSS files and USE_OPENSSL flag

ios/crnet/crnet_environment.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ios/crnet/crnet_environment.h"
 
 #import <Foundation/Foundation.h>
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/atomicops.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/i18n/icu_util.h"
 #include "base/json/json_writer.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_block.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/threading/worker_pool.h"
 #include "components/prefs/json_pref_store.h"
 #include "components/prefs/pref_filter.h"
 #include "crypto/nss_util.h"

[Eugene But (OOO till 7-30), 2016/04/19 15:00:12]

Do you still need this include?

[svaldez, 2016/04/19 15:12:25]

Done.

 #include "ios/crnet/sdch_owner_pref_storage.h"
 #include "ios/net/cookies/cookie_store_ios.h"
 #include "ios/net/crn_http_protocol_handler.h"
 #include "ios/net/empty_nsurlcache.h"
 #include "ios/net/http_cache_helper.h"
 #include "ios/net/request_tracker.h"
 #include "ios/web/public/user_agent.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_change_notifier.h"
 #include "net/base/sdch_manager.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert_net/nss_ocsp.h"

[Eugene But (OOO till 7-30), 2016/04/19 15:00:12]

And this

[svaldez, 2016/04/19 15:12:25]

Done.

 #include "net/cookies/cookie_store.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/http/http_stream_factory.h"
 #include "net/http/http_util.h"
 #include "net/log/net_log.h"
 #include "net/log/write_to_file_net_log_observer.h"
 #include "net/proxy/proxy_service.h"
 #include "net/sdch/sdch_owner.h"
@@ skipping 95 matching lines @@
 // static
 void CrNetEnvironment::Initialize() {
   DCHECK_EQ([NSThread currentThread], [NSThread mainThread]);
   if (!g_at_exit_)
     g_at_exit_ = new base::AtExitManager;
 
   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();
 
   // Create a message loop on the UI thread.
   base::MessageLoop* main_message_loop =
       new base::MessageLoop(base::MessageLoop::TYPE_UI);
 #pragma unused(main_message_loop)
   base::MessageLoopForUI::current()->Attach();
 }
@@ skipping 110 matching lines @@
       new base::Thread("Chrome File User Blocking Thread"));
   file_user_blocking_thread_->StartWithOptions(
       base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
 
   // The network change notifier must be initialized so that registered
   // delegates will receive callbacks.
   network_change_notifier_.reset(net::NetworkChangeNotifier::Create());
   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();
   PostToNetworkThread(FROM_HERE,
       base::Bind(&CrNetEnvironment::InitializeOnNetworkThread,
                  base::Unretained(this)));
 
   SetRequestFilterBlock(nil);
 }
 
 void CrNetEnvironment::InstallIntoSessionConfiguration(
     NSURLSessionConfiguration* config) {
   config.protocolClasses = @[ [CRNPauseableHTTPProtocolHandler class] ];
 }
 
 CrNetEnvironment::~CrNetEnvironment() {
   net::HTTPProtocolHandlerDelegate::SetInstance(nullptr);
-#if defined(USE_NSS_VERIFIER)
-  net::SetURLRequestContextForNSSHttpIO(nullptr);
-#endif
 }
 
 net::URLRequestContextGetter* CrNetEnvironment::GetMainContextGetter() {
   return main_context_getter_.get();
 }
 
 void CrNetEnvironment::SetHTTPProtocolHandlerRegistered(bool registered) {
   if (registered) {
     // Disable the default cache.
     [NSURLCache setSharedURLCache:[EmptyNSURLCache emptyNSURLCache]];
@@ skipping 162 matching lines @@
 
   return user_agent_settings->GetUserAgent();
 }
 
 void CrNetEnvironment::ClearCache(ClearCacheCallback callback) {
   PostToNetworkThread(
       FROM_HERE,
       base::Bind(&net::ClearHttpCache, main_context_getter_,
                  network_io_thread_->task_runner(), base::BindBlock(callback)));
 }