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 b3231f73197165f98f8e1afa827a465ec94f35d8..888fed9a9d0a718dcc1ab2fc074564c699f1011a 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -705,6 +705,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";