| Index: chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc
|
| diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc
|
| index 617a3be156fa6d7cdf52b27f5989e9b14d63fa60..6376a3c59d9621173dd0a212cba5095009f80b1f 100644
|
| --- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc
|
| +++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc
|
| @@ -339,8 +339,8 @@ void EasyUnlockTpmKeyManager::CreateKeyInSystemSlot(
|
|
|
| // This task interacts with the TPM, hence MayBlock().
|
| base::PostTaskWithTraits(
|
| - FROM_HERE, base::TaskTraits().MayBlock().WithShutdownBehavior(
|
| - base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
|
| + FROM_HERE,
|
| + {base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
|
| base::Bind(&CreateTpmKeyPairOnWorkerThread, base::Passed(&system_slot),
|
| public_key, base::ThreadTaskRunnerHandle::Get(),
|
| base::Bind(&EasyUnlockTpmKeyManager::OnTpmKeyCreated,
|
| @@ -356,8 +356,8 @@ void EasyUnlockTpmKeyManager::SignDataWithSystemSlot(
|
|
|
| // This task interacts with the TPM, hence MayBlock().
|
| base::PostTaskWithTraits(
|
| - FROM_HERE, base::TaskTraits().MayBlock().WithShutdownBehavior(
|
| - base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
|
| + FROM_HERE,
|
| + {base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
|
| base::Bind(&SignDataOnWorkerThread, base::Passed(&system_slot),
|
| public_key, data, base::ThreadTaskRunnerHandle::Get(),
|
| base::Bind(&EasyUnlockTpmKeyManager::OnDataSigned,
|
|
|