If easy sign-in is set up, allow TPMTokenLoader to start before login

chromeos/tpm/tpm_token_loader.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 "chromeos/tpm/tpm_token_loader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 52 matching lines @@
 }
 
 TPMTokenLoader::TPMTokenLoader(bool for_test)
     : initialized_for_test_(for_test),
       tpm_token_state_(TPM_STATE_UNKNOWN),
       tpm_token_info_getter_(
           TPMTokenInfoGetter::CreateForSystemToken(
               DBusThreadManager::Get()->GetCryptohomeClient(),
               base::ThreadTaskRunnerHandle::Get())),
       tpm_token_slot_id_(-1),
+      can_start_before_login_(false),
       weak_factory_(this) {
   if (!initialized_for_test_ && LoginState::IsInitialized())
     LoginState::Get()->AddObserver(this);
 
   if (initialized_for_test_) {
     tpm_token_state_ = TPM_TOKEN_INITIALIZED;
     tpm_user_pin_ = "111111";
   }
 }
 
 void TPMTokenLoader::SetCryptoTaskRunner(
     const scoped_refptr<base::SequencedTaskRunner>& crypto_task_runner) {
   crypto_task_runner_ = crypto_task_runner;
   MaybeStartTokenInitialization();
 }
 
+void TPMTokenLoader::EnsureStarted() {
+  if (can_start_before_login_)
+    return;
+  can_start_before_login_ = true;
+  MaybeStartTokenInitialization();
+}
+
 TPMTokenLoader::~TPMTokenLoader() {
   if (!initialized_for_test_ && LoginState::IsInitialized())
     LoginState::Get()->RemoveObserver(this);
 }
 
 TPMTokenLoader::TPMTokenStatus TPMTokenLoader::IsTPMTokenEnabled(
     const TPMReadyCallback& callback) {
   if (tpm_token_state_ == TPM_TOKEN_INITIALIZED)
     return TPM_TOKEN_STATUS_ENABLED;
   if (!IsTPMLoadingEnabled() || tpm_token_state_ == TPM_DISABLED)
@@ skipping 13 matching lines @@
 }
 
 void TPMTokenLoader::MaybeStartTokenInitialization() {
   CHECK(thread_checker_.CalledOnValidThread());
 
   // This is the entry point to the TPM token initialization process,
   // which we should do at most once.
   if (tpm_token_state_ != TPM_STATE_UNKNOWN || !crypto_task_runner_.get())
     return;
 
-  if (!LoginState::IsInitialized())
-    return;
-
-  bool start_initialization = LoginState::Get()->IsUserLoggedIn();
+  bool start_initialization =
+      (LoginState::IsInitialized() && LoginState::Get()->IsUserLoggedIn()) ||
+      can_start_before_login_;
 
   VLOG(1) << "StartTokenInitialization: " << start_initialization;
   if (!start_initialization)
     return;
 
   if (!IsTPMLoadingEnabled())
     tpm_token_state_ = TPM_DISABLED;
 
   ContinueTokenInitialization();
 
@@ skipping 86 matching lines @@
   }
   tpm_ready_callback_list_.clear();
 }
 
 void TPMTokenLoader::LoggedInStateChanged() {
   VLOG(1) << "LoggedInStateChanged";
   MaybeStartTokenInitialization();
 }
 
 }  // namespace chromeos