Developer help: Avoid crash on starting in desktop mode

BUG=121456
TEST=None


Review URL: http://codereview.chromium.org/10207016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133728 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/login/user_manager_impl.cc

@@ -907,9 +907,14 @@ void UserManagerImpl::LoadKeyStore() {
 
   // Only load the Opencryptoki library into NSS if we have this switch.
   // TODO(gspencer): Remove this switch once cryptohomed work is finished:
-  // http://crosbug.com/12295 and http://crosbug.com/12304
+  // http://crosbug.com/12295 and 12304
+  // Note: ChromeOS login with or without loginmanager will crash when
+  // the CertLibrary is not there (http://crosbug.com/121456). Before removing
+  // make sure that that case still works.
   if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kLoadOpencryptoki)) {
+          switches::kLoadOpencryptoki) ||
+      CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kStubCros)) {
     crypto::EnableTPMTokenForNSS(new RealTPMTokenInfoDelegate());
     CertLibrary* cert_library;
     cert_library = chromeos::CrosLibrary::Get()->GetCertLibrary();