Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: chrome/browser/chromeos/login/auth/parallel_authenticator.cc

Issue 317613004: Remove usage of singleton software_slot_ in nss on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/auth/parallel_authenticator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/auth/parallel_authenticator.cc
diff --git a/chrome/browser/chromeos/login/auth/parallel_authenticator.cc b/chrome/browser/chromeos/login/auth/parallel_authenticator.cc
index c729704df0ee35ac0bb16224378a759d3282653b..c2475e288f5d422bc67633a6a8256ae51af2b389 100644
--- a/chrome/browser/chromeos/login/auth/parallel_authenticator.cc
+++ b/chrome/browser/chromeos/login/auth/parallel_authenticator.cc
@@ -508,14 +508,16 @@ bool ParallelAuthenticator::VerifyOwner() {
const std::string& user_id = current_state_->user_context.GetUserID();
OwnerSettingsServiceFactory::GetInstance()->SetUsername(user_id);
- // This should trigger certificate loading, which is needed in order to
- // correctly determine if the current user is the owner.
+ // |IsOwnerForSafeModeAsync| expects logged in state to be
+ // LOGGED_IN_SAFE_MODE.
if (LoginState::IsInitialized()) {
LoginState::Get()->SetLoggedInState(LoginState::LOGGED_IN_SAFE_MODE,
LoginState::LOGGED_IN_USER_NONE);
}
- OwnerSettingsService::IsPrivateKeyExistAsync(
+ OwnerSettingsService::IsOwnerForSafeModeAsync(
+ user_id,
+ current_state_->user_context.GetUserIDHash(),
base::Bind(&ParallelAuthenticator::OnOwnershipChecked, this));
return false;
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/auth/parallel_authenticator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698