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 /chrome | |
| 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 'chrome')
4 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc b/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc index d5681d0..804a32e 100644 --- a/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc +++ b/chrome/browser/chromeos/login/auth/chrome_cryptohome_authenticator.cc @@ -45,7 +45,6 @@ void ChromeCryptohomeAuthenticator::CheckSafeModeOwnership( } OwnerSettingsService::IsOwnerForSafeModeAsync( - context.GetUserID(), context.GetUserIDHash(), OwnerSettingsServiceFactory::GetInstance()->GetOwnerKeyUtil(), callback); diff --git a/chrome/browser/chromeos/ownership/owner_settings_service.cc b/chrome/browser/chromeos/ownership/owner_settings_service.cc index 4277700..d9afe65 100644 --- a/chrome/browser/chromeos/ownership/owner_settings_service.cc +++ b/chrome/browser/chromeos/ownership/owner_settings_service.cc @@ -377,7 +377,6 @@ void OwnerSettingsService::OwnerKeySet(bool success) { // static void OwnerSettingsService::IsOwnerForSafeModeAsync( - const std::string& user_id, const std::string& user_hash, const scoped_refptr<OwnerKeyUtil>& owner_key_util, const IsOwnerCallback& callback) { @@ -389,7 +388,6 @@ void OwnerSettingsService::IsOwnerForSafeModeAsync( BrowserThread::IO, FROM_HERE, base::Bind(base::IgnoreResult(&crypto::InitializeNSSForChromeOSUser), - user_id, user_hash, ProfileHelper::GetProfilePathByUserIdHash(user_hash)), base::Bind(&DoesPrivateKeyExistAsync, owner_key_util, callback)); diff --git a/chrome/browser/chromeos/ownership/owner_settings_service.h b/chrome/browser/chromeos/ownership/owner_settings_service.h index ce8bc33d..37bbabb 100644 --- a/chrome/browser/chromeos/ownership/owner_settings_service.h +++ b/chrome/browser/chromeos/ownership/owner_settings_service.h @@ -69,7 +69,6 @@ class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate, // Checks if the user is the device owner, without the user profile having to // been initialized. Should be used only if login state is in safe mode. static void IsOwnerForSafeModeAsync( - const std::string& user_id, const std::string& user_hash, const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util, const IsOwnerCallback& callback); diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 46891fe..c61fda3 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -304,7 +304,7 @@ void StartNSSInitOnIOThread(const std::string& username, << " hash:" << username_hash; // Make sure NSS is initialized for the user. - crypto::InitializeNSSForChromeOSUser(username, username_hash, path); + crypto::InitializeNSSForChromeOSUser(username_hash, path); // Check if it's OK to initialize TPM for the user before continuing. This // may not be the case if the TPM slot initialization was previously |