diff options
| author | pneubeck <pneubeck@chromium.org> | 2014-09-12 02:59:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-12 10:04:18 +0000 |
| commit | fa32f2e56ac125ff2c95f35473f123a8d2bc2012 (patch) | |
| tree | 2c554561551ea65a58c2467391b9e4650098f88a /crypto | |
| parent | e84a1d22e950b8b12eb08124a57d0d23f907bcee (diff) | |
| download | chromium_src-fa32f2e56ac125ff2c95f35473f123a8d2bc2012.zip chromium_src-fa32f2e56ac125ff2c95f35473f123a8d2bc2012.tar.gz chromium_src-fa32f2e56ac125ff2c95f35473f123a8d2bc2012.tar.bz2 | |
Remove unused user email argument from nss_util.
BUG=413219
(for trivial refactoring)
TBR=willchan@chromium.org,rsleevi@chromium.org,nkostylev@chromium.org
Review URL: https://codereview.chromium.org/560303002
Cr-Commit-Position: refs/heads/master@{#294570}
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/nss_util.cc | 16 | ||||
| -rw-r--r-- | crypto/nss_util_internal.h | 1 | ||||
| -rw-r--r-- | crypto/scoped_test_nss_chromeos_user.cc | 4 |
3 files changed, 8 insertions, 13 deletions
diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc index f0c726d..cc4df1c 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) { diff --git a/crypto/nss_util_internal.h b/crypto/nss_util_internal.h index 839d7ba7..f321343 100644 --- a/crypto/nss_util_internal.h +++ b/crypto/nss_util_internal.h @@ -64,7 +64,6 @@ CRYPTO_EXPORT_PRIVATE void SetSystemKeySlotForTesting(ScopedPK11Slot slot); // Prepare per-user NSS slot mapping. It is safe to call this function multiple // times. Returns true if the user was added, or false if it already existed. CRYPTO_EXPORT bool InitializeNSSForChromeOSUser( - const std::string& email, const std::string& username_hash, const base::FilePath& path); diff --git a/crypto/scoped_test_nss_chromeos_user.cc b/crypto/scoped_test_nss_chromeos_user.cc index 20eadf4..aec25d8 100644 --- a/crypto/scoped_test_nss_chromeos_user.cc +++ b/crypto/scoped_test_nss_chromeos_user.cc @@ -17,8 +17,8 @@ ScopedTestNSSChromeOSUser::ScopedTestNSSChromeOSUser( return; // This opens a software DB in the given folder. In production code that is in // the home folder, but for testing the temp folder is used. - constructed_successfully_ = InitializeNSSForChromeOSUser( - username_hash, username_hash, temp_dir_.path()); + constructed_successfully_ = + InitializeNSSForChromeOSUser(username_hash, temp_dir_.path()); } ScopedTestNSSChromeOSUser::~ScopedTestNSSChromeOSUser() { |