Remove crypto::GetTPMTokenInfo which is no longer necessary.

chromeos/cert_loader.cc

 // Copyright (c) 2013 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/cert_loader.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/observer_list.h"
@@ skipping 117 matching lines @@
 
 void CertLoader::RemoveObserver(CertLoader::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 bool CertLoader::CertificatesLoading() const {
   return certificates_requested_ && !certificates_loaded_;
 }
 
 bool CertLoader::IsHardwareBacked() const {
   return !tpm_token_name_.empty();

[wtc, 2013/11/23 00:42:29]

The tpm_token_name_ member is now only used by this method. Perhaps this method
can check tpm_token_slot_id_ != -1 instead, which will allow us to remove the
tpm_token_name_ member.

[mattm, 2013/11/23 01:30:50]

It also has a getter in the header file, which is used by
CertLibrary::IsCertHardwareBackedAt
(chrome/browser/chromeos/options/cert_library.cc), but that could probably be
changed to use PK11_IsHW like in https://codereview.chromium.org/76653003/.

 }
 
 void CertLoader::MaybeRequestCertificates() {
   CHECK(thread_checker_.CalledOnValidThread());
 
   // This is the entry point to the TPM token initialization process,
   // which we should do at most once.
   if (certificates_requested_ || !crypto_task_runner_.get())
     return;
 
@@ skipping 56 matching lines @@
       // and CryptohomeClient calls are not thread safe.
       DBusThreadManager::Get()->GetCryptohomeClient()->Pkcs11GetTpmTokenInfo(
           base::Bind(&CertLoader::OnPkcs11GetTpmTokenInfo,
                      initialize_token_factory_.GetWeakPtr()));
       return;
     }
     case TPM_TOKEN_INFO_RECEIVED: {
       base::PostTaskAndReplyWithResult(
           crypto_task_runner_.get(),
           FROM_HERE,
-          base::Bind(&crypto::InitializeTPMToken,
-                     tpm_token_name_,
-                     tpm_token_slot_id_,
-                     tpm_user_pin_),
+          base::Bind(&crypto::InitializeTPMToken, tpm_token_slot_id_),
           base::Bind(&CertLoader::OnTPMTokenInitialized,
                      initialize_token_factory_.GetWeakPtr()));
       return;
     }
     case TPM_TOKEN_INITIALIZED: {
       StartLoadCertificates();
       return;
     }
   }
 }
@@ skipping 75 matching lines @@
                                          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;

[wtc, 2013/11/23 00:42:29]

Should we delete the tpm_user_pin_ member and the user_pin input argument?

[mattm, 2013/11/23 01:30:50]

It also has a getter which is used in a few places, some chromeos people would
have to look at whether those could be removed.

   tpm_token_state_ = TPM_TOKEN_INFO_RECEIVED;
 
   InitializeTokenAndLoadCertificates();
 }
 
 void CertLoader::OnTPMTokenInitialized(bool success) {
   VLOG(1) << "OnTPMTokenInitialized: " << success;
   if (!success) {
     RetryTokenInitializationLater();
     return;
@@ skipping 70 matching lines @@
   VLOG(1) << "OnCertRemoved";
   LoadCertificates();
 }
 
 void CertLoader::LoggedInStateChanged() {
   VLOG(1) << "LoggedInStateChanged";
   MaybeRequestCertificates();
 }
 
 }  // namespace chromeos