Update TaskTraits in platform_keys_nss.cc.

chrome/browser/chromeos/platform_keys/platform_keys_nss.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 <cert.h>
 #include <cryptohi.h>
 #include <keyhi.h>
 #include <secder.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 423 matching lines @@
                   public_key_der->len),
       std::string() /* no error */);
 }
 
 // Continues generating a RSA key with the obtained NSSCertDatabase. Used by
 // GenerateRSAKey().
 void GenerateRSAKeyWithDB(std::unique_ptr<GenerateRSAKeyState> state,
                           net::NSSCertDatabase* cert_db) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // Only the slot and not the NSSCertDatabase is required. Ignore |cert_db|.
-  // This task interacts with the TPM, hence WithFileIO() and WithWait().
+  // This task interacts with the TPM, hence MayBlock().
   base::PostTaskWithTraits(
       FROM_HERE, base::TaskTraits()
-                     .WithFileIO()
-                     .WithWait()
+                     .MayBlock()
                      .WithPriority(base::TaskPriority::BACKGROUND)
                      .WithShutdownBehavior(
                          base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
       base::Bind(&GenerateRSAKeyOnWorkerThread, base::Passed(&state)));
 }
 
 // Does the actual signing on a worker thread. Used by SignRSAWithDB().
 void SignRSAOnWorkerThread(std::unique_ptr<SignRSAState> state) {
   const uint8_t* public_key_uint8 =
       reinterpret_cast<const uint8_t*>(state->public_key_.data());
@@ skipping 72 matching lines @@
   }
 
   state->CallBack(FROM_HERE, signature_str, std::string() /* no error */);
 }
 
 // Continues signing with the obtained NSSCertDatabase. Used by Sign().
 void SignRSAWithDB(std::unique_ptr<SignRSAState> state,
                    net::NSSCertDatabase* cert_db) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   // Only the slot and not the NSSCertDatabase is required. Ignore |cert_db|.
-  // This task interacts with the TPM, hence WithFileIO() and WithWait().
+  // This task interacts with the TPM, hence MayBlock().
   base::PostTaskWithTraits(
       FROM_HERE, base::TaskTraits()
-                     .WithFileIO()
-                     .WithWait()
+                     .MayBlock()
                      .WithPriority(base::TaskPriority::BACKGROUND)
                      .WithShutdownBehavior(
                          base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
       base::Bind(&SignRSAOnWorkerThread, base::Passed(&state)));
 }
 
 // Called when ClientCertStoreChromeOS::GetClientCerts is done. Builds the list
 // of net::CertificateList and calls back. Used by
 // SelectCertificatesOnIOThread().
 void DidSelectCertificatesOnIOThread(
@@ skipping 46 matching lines @@
   state->CallBack(FROM_HERE, std::move(client_certs),
                   std::string() /* no error */);
 }
 
 // Passes the obtained certificates to the worker thread for filtering. Used by
 // GetCertificatesWithDB().
 void DidGetCertificates(std::unique_ptr<GetCertificatesState> state,
                         std::unique_ptr<net::CertificateList> all_certs) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   state->certs_ = std::move(all_certs);
-  // This task interacts with the TPM, hence WithFileIO() and WithWait().
+  // This task interacts with the TPM, hence MayBlock().
   base::PostTaskWithTraits(
       FROM_HERE, base::TaskTraits()
-                     .WithFileIO()
-                     .WithWait()
+                     .MayBlock()
                      .WithPriority(base::TaskPriority::BACKGROUND)
                      .WithShutdownBehavior(
                          base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN),
       base::Bind(&FilterCertificatesOnWorkerThread, base::Passed(&state)));
 }
 
 // Continues getting certificates with the obtained NSSCertDatabase. Used by
 // GetCertificates().
 void GetCertificatesWithDB(std::unique_ptr<GetCertificatesState> state,
                            net::NSSCertDatabase* cert_db) {
@@ skipping 283 matching lines @@
   NSSOperationState* state_ptr = state.get();
   GetCertDatabase(std::string() /* don't get any specific slot */,
                   base::Bind(&GetTokensWithDB, base::Passed(&state)),
                   browser_context,
                   state_ptr);
 }
 
 }  // namespace platform_keys
 
 }  // namespace chromeos