ChromeOS: only use CertVerifyProcChromeOS if multiprofiles is allowed.

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index f8ea00c9b531f50991762a9cff38f8512e80c944..f5a4583814d806ac9794826e5263ae1b86e0c522 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,9 +553,14 @@ 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()));
+  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 {
+    globals_->cert_verifier.reset(new net::MultiThreadedCertVerifier(
+        net::CertVerifyProc::CreateDefault()));
+  }
 #else

[Ryan Sleevi, 2014/02/12 07:06:44]

I'm wondering whether this should be folded in with the next line

#if defined(OS_CHROMEOS)
if (...) {
   ...
} else
#else
{
  globals_->...
}
#endif

so that the else case and the non-CrOS case use the same path.

[mattm, 2014/02/12 23:25:46]

Yeah, I just wasn't sure whether code duplication or control structures that
cross ifdef boundaries is more ugly. I've changed it.

   globals_->cert_verifier.reset(
       new net::MultiThreadedCertVerifier(net::CertVerifyProc::CreateDefault()));