This change loads opencryptoki and uses the TPM for keygen tags.

chrome/browser/chromeos/login/user_manager.cc

Index: chrome/browser/chromeos/login/user_manager.cc
diff --git a/chrome/browser/chromeos/login/user_manager.cc b/chrome/browser/chromeos/login/user_manager.cc
index 922ac4dbcdf1d587fa93e054e2be2b3cb455db9f..3d948f078e4db4c32e1f4a0f6c2d8b7436e926d6 100644
--- a/chrome/browser/chromeos/login/user_manager.cc
+++ b/chrome/browser/chromeos/login/user_manager.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/chromeos/login/user_manager.h"
 
+#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -27,6 +28,7 @@
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_type.h"
@@ -568,7 +570,9 @@ void UserManager::NotifyOnLogin() {
   // Let the window manager know that we're logged in now.
   WmIpc::instance()->SetLoggedInProperty(true);
   // Ensure we've opened the real user's key/certificate database.
-  base::OpenPersistentNSSDB();
+  bool init_tpm =
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoadOpencryptoki);
+  base::OpenPersistentNSSDB(init_tpm);
 
   // Schedules current user ownership check on file thread.
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,