Developer help: Avoid crash on starting in desktop mode

chrome/browser/chromeos/login/user_manager_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/desktop_background/desktop_background_controller.h"
@@ skipping 889 matching lines @@
 void UserManagerImpl::LoadKeyStore() {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (key_store_loaded_)
     return;
 
   // Ensure we've opened the real user's key/certificate database.
   crypto::OpenPersistentNSSDB();
 
   // 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();
     // Note: this calls crypto::EnsureTPMTokenReady()
     cert_library->RequestCertificates();
   }
   key_store_loaded_ = true;
 }
 
 void UserManagerImpl::SetInitialUserImage(const std::string& username) {
@@ skipping 338 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&UserManagerImpl::DeleteUserImage,
                    base::Unretained(this),
                    image_path));
   }
 }
 
 }  // namespace chromeos