Remove usage of singleton software_slot_ in nss on ChromeOS

chrome/browser/chromeos/login/auth/parallel_authenticator.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/auth/parallel_authenticator.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 490 matching lines @@
   if (!is_safe_mode) {
     // Now we can continue with the login and report mount success.
     user_can_login_ = true;
     owner_is_verified_ = true;
     return true;
   }
 
   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;
 }
 
 void ParallelAuthenticator::OnOwnershipChecked(bool is_owner) {
   // Now we can check if this user is the owner.
   user_can_login_ = is_owner;
   owner_is_verified_ = true;
   Resolve();
 }
@@ skipping 286 matching lines @@
   Resolve();
 }
 
 void ParallelAuthenticator::SetOwnerState(bool owner_check_finished,
                                           bool check_result) {
   owner_is_verified_ = owner_check_finished;
   user_can_login_ = check_result;
 }
 
 }  // namespace chromeos