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

Unified Diff: ios/crnet/crnet_environment.mm

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 8 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 b564111b6094572c861928c7b957db95a43e6b0a..f8c98ed17c945f542e61bec141241cc3d5afa3c5 100644
--- a/ios/crnet/crnet_environment.mm
+++ b/ios/crnet/crnet_environment.mm
@@ -26,7 +26,6 @@
#include "base/threading/worker_pool.h"
#include "components/prefs/json_pref_store.h"
#include "components/prefs/pref_filter.h"
-#include "crypto/nss_util.h"
#include "ios/crnet/sdch_owner_pref_storage.h"
#include "ios/net/cookies/cookie_store_ios.h"
#include "ios/net/crn_http_protocol_handler.h"
@@ -38,7 +37,6 @@
#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"
#include "net/cookies/cookie_store.h"
#include "net/http/http_auth_handler_factory.h"
#include "net/http/http_cache.h"
@@ -154,14 +152,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 +282,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 +299,6 @@ 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