| Index: crypto/nss_util.cc
|
| diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
|
| index f0c726d4796437ef9cf2046e21dbc75ffe0009ec..cc4df1c9c5af753466308dfe560c179e2901fa78 100644
|
| --- a/crypto/nss_util.cc
|
| +++ b/crypto/nss_util.cc
|
| @@ -450,10 +450,8 @@ class NSSInitSingleton {
|
| return crypto::ScopedPK11Slot(slot);
|
| }
|
|
|
| - bool InitializeNSSForChromeOSUser(
|
| - const std::string& email,
|
| - const std::string& username_hash,
|
| - const base::FilePath& path) {
|
| + bool InitializeNSSForChromeOSUser(const std::string& username_hash,
|
| + const base::FilePath& path) {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
| if (chromeos_user_map_.find(username_hash) != chromeos_user_map_.end()) {
|
| // This user already exists in our mapping.
|
| @@ -1045,12 +1043,10 @@ void InitializeTPMTokenAndSystemSlot(
|
| callback);
|
| }
|
|
|
| -bool InitializeNSSForChromeOSUser(
|
| - const std::string& email,
|
| - const std::string& username_hash,
|
| - const base::FilePath& path) {
|
| - return g_nss_singleton.Get().InitializeNSSForChromeOSUser(
|
| - email, username_hash, path);
|
| +bool InitializeNSSForChromeOSUser(const std::string& username_hash,
|
| + const base::FilePath& path) {
|
| + return g_nss_singleton.Get().InitializeNSSForChromeOSUser(username_hash,
|
| + path);
|
| }
|
|
|
| bool ShouldInitializeTPMForChromeOSUser(const std::string& username_hash) {
|
|
|