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

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index c6b099ab467d004f5d6b60b47b2131695cc55831..9334281559d7014f106738265fbd40790903a834 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -699,6 +699,13 @@ const char kKeepAliveForTest[]              = "keep-alive-for-test";
 // Load an extension from the specified directory.
 const char kLoadExtension[]                 = "load-extension";
 
+// Load the opencryptoki library into NSS at startup.  This is only
+// needed temporarily for developers who need to work on WiFi/VPN
+// certificate code.
+// TODO(gspencer): Remove this switch once cryptohomed work is finished:
+// http://crosbug.com/12295 and http://crosbug.com/12304
+const char kLoadOpencryptoki[]              = "load-opencryptoki";
+
 // Uninstall an extension with the specified extension id.
 const char kUninstallExtension[]            = "uninstall-extension";