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

base/nss_util.h

Index: base/nss_util.h
diff --git a/base/nss_util.h b/base/nss_util.h
index 4be12cea5867b52c5972296b8913ddcc917d31d9..4d7ecaea9ac41e3418a589ac5605cd1f3243f0eb 100644
--- a/base/nss_util.h
+++ b/base/nss_util.h
@@ -6,6 +6,7 @@
 #define BASE_NSS_UTIL_H_
 #pragma once
 
+#include <string>
 #include "base/basictypes.h"
 
 #if defined(USE_NSS)
@@ -79,8 +80,13 @@ void LoadNSSLibraries();
 bool CheckNSSVersion(const char* version);
 
 #if defined(OS_CHROMEOS)
-// Open the r/w nssdb that's stored inside the user's encrypted home directory.
-void OpenPersistentNSSDB();
+// Open the r/w nssdb that's stored inside the user's encrypted home
+// directory.  If |load_opencryptoki| is true, then load the
+// opencryptoki module.
+void OpenPersistentNSSDB(bool load_opencryptoki);
+
+// Get name for the built-in TPM token on ChromeOS.
+std::string GetTPMTokenName();
 #endif
 
 // Convert a NSS PRTime value into a base::Time object.