Merge 253942 "chromeos: Load chaps module and lookup TPM slots o..."

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 30 matching lines @@
 void CallOpenPersistentNSSDB() {
   // Called from crypto_task_runner_.
   VLOG(1) << "CallOpenPersistentNSSDB";
 
   // Ensure we've opened the user's key/certificate database.
   if (base::SysInfo::IsRunningOnChromeOS())
     crypto::OpenPersistentNSSDB();
   crypto::EnableTPMTokenForNSS();
 }
 
+void PostResultToTaskRunner(scoped_refptr<base::SequencedTaskRunner> runner,
+                            const base::Callback<void(bool)>& callback,
+                            bool success) {
+  runner->PostTask(FROM_HERE, base::Bind(callback, success));
+}
+
 }  // namespace
 
 static TPMTokenLoader* g_tpm_token_loader = NULL;
 
 // static
 void TPMTokenLoader::Initialize() {
   CHECK(!g_tpm_token_loader);
   g_tpm_token_loader = new TPMTokenLoader(false /*for_test*/);
 }
 
@@ skipping 129 matching lines @@
     }
     case TPM_TOKEN_READY: {
       // Retrieve token_name_ and 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: {
-      base::PostTaskAndReplyWithResult(
-          crypto_task_runner_.get(),
+      crypto_task_runner_->PostTask(
           FROM_HERE,
-          base::Bind(&crypto::InitializeTPMToken, tpm_token_slot_id_),
-          base::Bind(&TPMTokenLoader::OnTPMTokenInitialized,
-                     weak_factory_.GetWeakPtr()));
+          base::Bind(
+              &crypto::InitializeTPMToken,
+              tpm_token_slot_id_,
+              base::Bind(&PostResultToTaskRunner,
+                         base::MessageLoopProxy::current(),
+                         base::Bind(&TPMTokenLoader::OnTPMTokenInitialized,
+                                    weak_factory_.GetWeakPtr()))));
       return;
     }
     case TPM_TOKEN_INITIALIZED: {
       NotifyTPMTokenReady();
       return;
     }
   }
 }
 
 void TPMTokenLoader::RetryTokenInitializationLater() {
@@ skipping 70 matching lines @@
 void TPMTokenLoader::NotifyTPMTokenReady() {
   FOR_EACH_OBSERVER(Observer, observers_, OnTPMTokenReady());
 }
 
 void TPMTokenLoader::LoggedInStateChanged() {
   VLOG(1) << "LoggedInStateChanged";
   MaybeStartTokenInitialization();
 }
 
 }  // namespace chromeos