Simplify LoginState methods.

chromeos/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_token_loader.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 122 matching lines @@
   bool start_initialization = LoginState::Get()->IsUserLoggedIn();
 
   VLOG(1) << "StartTokenInitialization: " << start_initialization;
   if (!start_initialization)
     return;
 
   if (!base::SysInfo::IsRunningOnChromeOS())
     tpm_token_state_ = TPM_DISABLED;
 
   // Treat TPM as disabled for guest users since they do not store certs.
-  if (LoginState::Get()->IsGuestUser())
+  if (LoginState::Get()->IsGuestSessionUser() ||
+      LoginState::Get()->IsPublicSessionUser()) {
     tpm_token_state_ = TPM_DISABLED;
+  }
 
   ContinueTokenInitialization();
 
   DCHECK_NE(tpm_token_state_, TPM_STATE_UNKNOWN);
 }
 
 void TPMTokenLoader::ContinueTokenInitialization() {
   CHECK(thread_checker_.CalledOnValidThread());
   VLOG(1) << "ContinueTokenInitialization: " << tpm_token_state_;
 
@@ skipping 128 matching lines @@
 void TPMTokenLoader::NotifyTPMTokenReady() {
   FOR_EACH_OBSERVER(Observer, observers_, OnTPMTokenReady());
 }
 
 void TPMTokenLoader::LoggedInStateChanged() {
   VLOG(1) << "LoggedInStateChanged";
   MaybeStartTokenInitialization();
 }
 
 }  // namespace chromeos