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

Unified Diff: chrome/browser/io_thread.cc

Issue 271533004: Turning on MultiProfile by default for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 29a65ea48f601176a962665995c2e1a324cddbaa..ae45e0d55c910cbfed61c66a15e92924ae9469c4 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -102,7 +102,6 @@
#endif
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h"
#endif
@@ -546,17 +545,15 @@ void IOThread::InitAsync() {
globals_->host_resolver = CreateGlobalHostResolver(net_log_);
UpdateDnsClientEnabled();
#if defined(OS_CHROMEOS)
- 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
- {
+ // 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()));
- }
- globals_->transport_security_state.reset(new net::TransportSecurityState());
+#endif
+
+ globals_->transport_security_state.reset(new net::TransportSecurityState());
#if !defined(USE_OPENSSL)
// For now, Certificate Transparency is only implemented for platforms
// that use NSS.

Powered by Google App Engine
This is Rietveld 408576698