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

Unified Diff: ios/chrome/browser/ios_chrome_io_thread.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 | « crypto/third_party/nss/secsign.cc ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ios_chrome_io_thread.mm
diff --git a/ios/chrome/browser/ios_chrome_io_thread.mm b/ios/chrome/browser/ios_chrome_io_thread.mm
index 763c0280813c3b0d6b298cc44c1a14e00c452339..f0fa384f5f89b04e775daf156eedf66dfe62452d 100644
--- a/ios/chrome/browser/ios_chrome_io_thread.mm
+++ b/ios/chrome/browser/ios_chrome_io_thread.mm
@@ -54,7 +54,6 @@
#include "net/cert/ct_verifier.h"
#include "net/cert/multi_log_ct_verifier.h"
#include "net/cert/multi_threaded_cert_verifier.h"
-#include "net/cert_net/nss_ocsp.h"
#include "net/cookies/cookie_monster.h"
#include "net/cookies/cookie_store.h"
#include "net/dns/host_cache.h"
@@ -146,17 +145,11 @@ const char kSpdyDepencenciesFieldTrialDisable[] = "Disable";
class SystemURLRequestContext : public net::URLRequestContext {
public:
SystemURLRequestContext() {
-#if defined(USE_NSS_VERIFIER)
- net::SetURLRequestContextForNSSHttpIO(this);
-#endif
}
private:
~SystemURLRequestContext() override {
AssertNoURLRequests();
-#if defined(USE_NSS_VERIFIER)
- net::SetURLRequestContextForNSSHttpIO(nullptr);
-#endif
}
};
@@ -389,10 +382,6 @@ void IOSChromeIOThread::Init() {
TRACE_EVENT0("startup", "IOSChromeIOThread::Init");
DCHECK_CURRENTLY_ON(web::WebThread::IO);
-#if defined(USE_NSS_VERIFIER)
- net::SetMessageLoopForNSSHttpIO();
-#endif
-
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
@@ -491,10 +480,6 @@ void IOSChromeIOThread::Init() {
}
void IOSChromeIOThread::CleanUp() {
-#if defined(USE_NSS_VERIFIER)
- net::ShutdownNSSHttpIO();
-#endif
-
system_url_request_context_getter_ = nullptr;
// Release objects that the net::URLRequestContext could have been pointing
« no previous file with comments | « crypto/third_party/nss/secsign.cc ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698