Make nss/TPM integration in ChromeOS more robust.

chrome/browser/chromeos/login/user_manager.cc

 // Copyright (c) 2012 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/user_manager.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 220 matching lines @@
 
 RealTPMTokenInfoDelegate::RealTPMTokenInfoDelegate() : token_ready_(false) {}
 RealTPMTokenInfoDelegate::~RealTPMTokenInfoDelegate() {}
 
 bool RealTPMTokenInfoDelegate::IsTokenAvailable() const {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return CrosLibrary::Get()->GetCryptohomeLibrary()->TpmIsEnabled();
 }
 
 bool RealTPMTokenInfoDelegate::IsTokenReady() const {
+  if (token_ready_)
+    return true;
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (!token_ready_) {
-    // Retrieve token_name_ and user_pin_ here since they will never change
-    // and CryptohomeLibrary calls are not thread safe.
-    if (CrosLibrary::Get()->GetCryptohomeLibrary()->Pkcs11IsTpmTokenReady()) {
-      CrosLibrary::Get()->GetCryptohomeLibrary()->Pkcs11GetTpmTokenInfo(
-          &token_name_, &user_pin_);
-      token_ready_ = true;
-    }
+  // Retrieve token_name_ and user_pin_ here since they will never change
+  // and CryptohomeLibrary calls are not thread safe.
+  if (CrosLibrary::Get()->GetCryptohomeLibrary()->Pkcs11IsTpmTokenReady()) {
+    CrosLibrary::Get()->GetCryptohomeLibrary()->Pkcs11GetTpmTokenInfo(
+        &token_name_, &user_pin_);
+    token_ready_ = true;
   }
   return token_ready_;
 }
 
 void RealTPMTokenInfoDelegate::GetTokenInfo(std::string* token_name,
                                             std::string* user_pin) const {
   // May be called from a non UI thread, but must only be called after
   // IsTokenReady() returns true.
   CHECK(token_ready_);
   if (token_name)
@@ skipping 735 matching lines @@
 
 User* UserManager::CreateUser(const std::string& email) const {
   User* user = new User(email, email == kGuestUser);
   user->set_oauth_token_status(LoadUserOAuthStatus(email));
   // Used to determine whether user's display name is unique.
   ++display_name_count_[user->GetDisplayName()];
   return user;
 }
 
 }  // namespace chromeos