Remove nss_util.h dependency from FakeCryptohomeClient.

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 166 matching lines @@
       NotifyTPMTokenReady();
       return;
     }
     case TPM_ENABLED: {
       DBusThreadManager::Get()->GetCryptohomeClient()->Pkcs11IsTpmTokenReady(
           base::Bind(&TPMTokenLoader::OnPkcs11IsTpmTokenReady,
                      weak_factory_.GetWeakPtr()));
       return;
     }
     case TPM_TOKEN_READY: {
-      // Retrieve token_name_ and user_pin_ here since they will never change
+      // Retrieve user_pin_ here since they will never change
       // and CryptohomeClient calls are not thread safe.
       DBusThreadManager::Get()->GetCryptohomeClient()->Pkcs11GetTpmTokenInfo(
           base::Bind(&TPMTokenLoader::OnPkcs11GetTpmTokenInfo,
                      weak_factory_.GetWeakPtr()));
       return;
     }
     case TPM_TOKEN_INFO_RECEIVED: {
       crypto_task_runner_->PostTask(
           FROM_HERE,
           base::Bind(
@@ skipping 58 matching lines @@
                                              const std::string& token_name,
                                              const std::string& user_pin,
                                              int token_slot_id) {
   VLOG(1) << "OnPkcs11GetTpmTokenInfo: " << token_name;
 
   if (call_status == DBUS_METHOD_CALL_FAILURE) {
     RetryTokenInitializationLater();
     return;
   }
 
-  tpm_token_name_ = token_name;
   tpm_token_slot_id_ = token_slot_id;
   tpm_user_pin_ = user_pin;
   tpm_token_state_ = TPM_TOKEN_INFO_RECEIVED;
 
   ContinueTokenInitialization();
 }
 
 void TPMTokenLoader::OnTPMTokenInitialized(bool success) {
   VLOG(1) << "OnTPMTokenInitialized: " << success;
   if (!success) {
     RetryTokenInitializationLater();
     return;
   }
   tpm_token_state_ = TPM_TOKEN_INITIALIZED;
   ContinueTokenInitialization();
 }
 
 void TPMTokenLoader::NotifyTPMTokenReady() {
   FOR_EACH_OBSERVER(Observer, observers_, OnTPMTokenReady());
 }
 
 void TPMTokenLoader::LoggedInStateChanged() {
   VLOG(1) << "LoggedInStateChanged";
   MaybeStartTokenInitialization();
 }
 
 }  // namespace chromeos