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

Unified Diff: chrome/browser/io_thread.cc

Issue 137553004: NSS Cros multiprofile: trust roots added by a profile shouldn't apply to other profiles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: handle additional trust roots, add TestRootCertsTest.Contains, remove instantiated certtests from c… Created 6 years, 11 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
Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index af4638314d5caf594a42e38d32c6d9f553983766..a11b58926b5621c0f595aadb346119418cd653bc 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -103,6 +103,11 @@
#include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings.h"
#endif
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
+#include "net/cert/multi_threaded_cert_verifier.h"
+#endif
+
using content::BrowserThread;
class SafeBrowsingURLRequestContext;
@@ -544,7 +549,13 @@ void IOThread::InitAsync() {
globals_->system_network_delegate.reset(network_delegate);
globals_->host_resolver = CreateGlobalHostResolver(net_log_);
UpdateDnsClientEnabled();
+#if defined(OS_CHROMEOS)
+ // Creates a CertVerifyProc that doesn't allow any profile-provided certs.
+ globals_->cert_verifier.reset(new net::MultiThreadedCertVerifier(
+ new chromeos::CertVerifyProcChromeOS()));
+#else
globals_->cert_verifier.reset(net::CertVerifier::CreateDefault());
Ryan Sleevi 2014/01/30 05:27:40 I think you should update this to use MultiThreade
mattm 2014/02/04 05:31:21 Done.
+#endif
globals_->transport_security_state.reset(new net::TransportSecurityState());
#if !defined(USE_OPENSSL)
// For now, Certificate Transparency is only implemented for platforms

Powered by Google App Engine
This is Rietveld 408576698