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

Unified Diff: chrome/browser/io_thread.cc

Issue 150203007: ChromeOS: only use CertVerifyProcChromeOS if multiprofiles is allowed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: NOLINT, 2 spaces Created 6 years, 10 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 | « no previous file | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index f8ea00c9b531f50991762a9cff38f8512e80c944..4d12f2e3f0ca577350d571d9c1459d93102508f8 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -107,6 +107,7 @@
#endif
#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
#endif
@@ -552,13 +553,16 @@ void IOThread::InitAsync() {
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(
- new net::MultiThreadedCertVerifier(net::CertVerifyProc::CreateDefault()));
+ if (chromeos::UserManager::IsMultipleProfilesAllowed()) {
+ // Creates a CertVerifyProc that doesn't allow any profile-provided certs.
+ globals_->cert_verifier.reset(new net::MultiThreadedCertVerifier(
+ new chromeos::CertVerifyProcChromeOS()));
+ } else // NOLINT Fallthrough to normal verifier if multiprofiles not allowed.
#endif
+ {
+ globals_->cert_verifier.reset(new net::MultiThreadedCertVerifier(
+ net::CertVerifyProc::CreateDefault()));
+ }
globals_->transport_security_state.reset(new net::TransportSecurityState());
#if !defined(USE_OPENSSL)
// For now, Certificate Transparency is only implemented for platforms
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698