[webcrypto] Make operations run on worker threads.

content/child/webcrypto/webcrypto_impl.cc

Index: content/child/webcrypto/webcrypto_impl.cc
diff --git a/content/child/webcrypto/webcrypto_impl.cc b/content/child/webcrypto/webcrypto_impl.cc
index ad0877106a6226dbb6529a9a9cc8fbf2ac3644de..47afe0bbba3fd1915bdafb318235b3b09950ff47 100644
--- a/content/child/webcrypto/webcrypto_impl.cc
+++ b/content/child/webcrypto/webcrypto_impl.cc
@@ -4,12 +4,21 @@
 
 #include "content/child/webcrypto/webcrypto_impl.h"
 
+#include "base/bind.h"
+#include "base/lazy_instance.h"
+#include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/single_thread_task_runner.h"
+#include "base/task_runner.h"
+#include "base/thread_task_runner_handle.h"
+#include "base/threading/sequenced_worker_pool.h"
+#include "base/threading/worker_pool.h"
 #include "content/child/webcrypto/crypto_data.h"
 #include "content/child/webcrypto/shared_crypto.h"
 #include "content/child/webcrypto/status.h"
 #include "content/child/webcrypto/webcrypto_util.h"
+#include "content/child/worker_thread_task_runner.h"
 #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
@@ -19,6 +28,73 @@ using webcrypto::Status;
 
 namespace {
 
+// ---------------------
+// Threading
+// ---------------------
+//
+// WebCrypto operations can be slow. For instance generating an RSA key can
+// take hundreds of milliseconds to several seconds.
+//
+// Moreover the underlying crypto libraries are not threadsafe when operating
+// on the same key.
+//
+// The strategy used here is to run a sequenced worker pool for all WebCrypto
+// operations. This pool (of 1 threads) is also used by requests started from
+// Blink Web Workers.
+//
+// A few notes to keep in mind:
+//
+// * PostTaskAndReply() cannot be used for two reasons:
+//
+//   (1) Blink web worker threads do not have an associated message loop so
+//       construction of the reply callback will crash.
+//
+//   (2) PostTaskAndReply() handles failure posting the reply by leaking the
+//       callback, rather than destroying it. In the case of Web Workers this
+//       condition is reachable via normal execution, since Web Workers can
+//       be stopped before the WebCrypto operation has finished. A policy of
+//       leaking would therefore be problematic.
+//
+// * blink::WebArrayBuffer is NOT threadsafe, and should therefore be allocated
+//   on the target Blink thread.
+//
+//   TODO(eroman): Is there any way around this? Copying the result between
+//                 threads is silly.
+//
+// * WebCryptoAlgorithm and WebCryptoKey are threadsafe (however the key's
+//   handle(), which wraps an NSS/OpenSSL type, may not be and should only be
+//   used from the webcrypto thread).
+//
+// * blink::WebCryptoResult is not threadsafe and should only be operated on
+//   the target Blink thread. HOWEVER, it is safe to delete it from any thread.
+//   This can happen if by the time the operation has completed in the crypto
+//   worker pool, the Blink worker thread that initiated the request is gone.
+//   Posting back to the origin thread will fail, and the WebCryptoResult will
+//   be deleted while running in the crypto worker pool.
+class CryptoThreadPool {
+ public:
+  CryptoThreadPool()
+      : worker_pool_(new base::SequencedWorkerPool(1, "WebCrypto")),
+        task_runner_(worker_pool_->GetSequencedTaskRunnerWithShutdownBehavior(
+            worker_pool_->GetSequenceToken(),
+            base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN)) {}
+
+  static bool PostTask(const tracked_objects::Location& from_here,
+                       const base::Closure& task);
+
+ private:
+  scoped_refptr<base::SequencedWorkerPool> worker_pool_;
+  scoped_refptr<base::SequencedTaskRunner> task_runner_;
+};
+
+base::LazyInstance<CryptoThreadPool>::Leaky crypto_thread_pool =
+    LAZY_INSTANCE_INITIALIZER;
+
+bool CryptoThreadPool::PostTask(const tracked_objects::Location& from_here,
+                                const base::Closure& task) {
+  return crypto_thread_pool.Get().task_runner_->PostTask(from_here, task);
+}
+
 void CompleteWithError(const Status& status, blink::WebCryptoResult* result) {
   DCHECK(status.IsError());
 
@@ -35,6 +111,71 @@ void CompleteWithError(const Status& status, blink::WebCryptoResult* result) {
 #endif
 }
 
+// Runs |work_func(state)| (on the crypto pool), and then posts a task back to
+// the origin thread to run |reply_callback|.
+template <typename State>
+void DoTaskThenPostReply(Status (*work_func)(State*),
+                         State* state,
+                         const base::Closure& reply_callback) {
+  state->status = work_func(state);
+  state->origin_thread->PostTask(FROM_HERE, reply_callback);
+}
+
+// Handles any errors. If there was no error, then calls |reply_func(state)| (on
+// the origin thread).
+template <typename State>
+void DoHandleErrorsAndReply(void (*reply_func)(State*),
+                            scoped_ptr<State> state) {
+  if (state->status.IsError())
+    CompleteWithError(state->status, &state->result);
+  else
+    reply_func(state.get());
+}
+
+// Posts a task to the crypto thread pool. Once that is done, posts a task back
+// to the origin thread to run the reply.
+//
+//  * work_func -- Function pointer to be run on the crypto thread pool. Should
+//                 return a Status object indicating success, and can stash any
+//                 results into the state parameter.
+//  * reply_func -- Function pointer to be run on the origin thread. Note this
+//  is
+//                  ONLY CALLED ON SUCCESS. If work_func returned an error, then
+//                  this will not be called.
+//  * state -- Holds the state that is passed between threads.
+template <typename State>
+void PostToCryptoThreadAndReply(const tracked_objects::Location& from_here,
+                                Status (*work_func)(State*),
+                                void (*reply_func)(State*),
+                                scoped_ptr<State> state) {
+  base::Closure reply_callback =
+      base::Bind(&DoHandleErrorsAndReply<State>, reply_func, Passed(&state));
+  if (!CryptoThreadPool::PostTask(FROM_HERE,
+                                  base::Bind(&DoTaskThenPostReply<State>,
+                                             work_func,
+                                             state.get(),
+                                             reply_callback))) {
+#if defined(WEBCRYPTO_HAS_ERROR_TYPE)
+    state->result.completeWithError(blink::WebCryptoErrorTypeOperation,
+                                    "Failed posting to crypto worker pool");
+#else
+    state->result->completeWithError("Failed posting to crypto worker pool");
+#endif
+  }
+}

[Ryan Sleevi, 2014/04/29 20:16:00]

Not LGTM. I don't like this co-opting of function pointers and templates.

You could just as easily have updated your code to use

void SomeFoo(scoped_ptr<State> passed_state) {
  State* state = passed_state.get();
  state->stuff;
  state->someotherstuff;
  state->result->PostTask(..., Passed(&passed_state));
}

Regardless of the .Pass()/Passed(), State* itself will remain both valid and
pointing to the same object, regardless of which scoped_ptr owns it.

[eroman, 2014/04/29 22:24:52]

Ok I can do that. I thought the new way was superior in that it saves redundancy
(with error handling and posting of tasks).

+
+void CompleteWithBuffer(const std::vector<uint8>& buffer,
+                        blink::WebCryptoResult* result) {
+  if (buffer.size() > UINT_MAX) {
+    // WebArrayBuffers have a smaller range than std::vector<>, so
+    // theoretically this could overflow.
+    CompleteWithError(Status::ErrorUnexpected(), result);
+  } else {
+    result->completeWithBuffer(webcrypto::Uint8VectorStart(buffer),
+                               buffer.size());
+  }
+}
+
 bool IsAlgorithmAsymmetric(const blink::WebCryptoAlgorithm& algorithm) {
   // TODO(padolph): include all other asymmetric algorithms once they are
   // defined, e.g. EC and DH.
@@ -43,25 +184,373 @@ bool IsAlgorithmAsymmetric(const blink::WebCryptoAlgorithm& algorithm) {
           algorithm.id() == blink::WebCryptoAlgorithmIdRsaOaep);
 }
 
+// Gets a task runner for the current thread. The current thread is either:
+//
+//   * The main Blink thread
+//   * A Blink web worker thread
+//
+// A different mechanism is needed for posting to these threads. The main
+// thread has an associated message loop and can simply use
+// base::ThreadTaskRunnerHandle. Whereas the web worker threads are managed by
+// Blink and need to be indirected through WorkerThreadTaskRunner.
+scoped_refptr<base::TaskRunner> GetCurrentBlinkThread() {
+  if (base::ThreadTaskRunnerHandle::IsSet())
+    return base::ThreadTaskRunnerHandle::Get();
+  return WorkerThreadTaskRunner::current();
+}
+
+// --------------------------------------------------------------------
+// State
+// --------------------------------------------------------------------
+//
+// Explicit state classes are used rather than base::Bind(). This is done
+// both for clarity, but also to avoid extraneous allocations for things
+// like passing buffers and result objects between threads.
+//
+// BaseState is the base class common to all of the async operations, and
+// keeps track of the thread to complete on, the error state, and the
+// callback into Blink.
+//
+// Ownership of the State object is passed between the crypto thread and the
+// Blink thread. Under normal completion it is destroyed on the Blink thread.
+// However it may also be destroyed on the crypto thread if the Blink thread
+// has vanished (which can happen for Blink web worker threads).
+
+struct BaseState {
+  explicit BaseState(const blink::WebCryptoResult& result)
+      : origin_thread(GetCurrentBlinkThread()), result(result) {}
+
+  scoped_refptr<base::TaskRunner> origin_thread;
+
+  webcrypto::Status status;
+  blink::WebCryptoResult result;
+
+ protected:
+  // Since there is no virtual destructor, must not delete directly as a
+  // BaseState.
+  ~BaseState() {}
+};
+
+struct EncryptState : public BaseState {
+  EncryptState(const blink::WebCryptoAlgorithm& algorithm,
+               const blink::WebCryptoKey& key,
+               const unsigned char* data,
+               unsigned int data_size,
+               const blink::WebCryptoResult& result)
+      : BaseState(result),
+        algorithm(algorithm),
+        key(key),
+        data(data, data + data_size) {}
+
+  const blink::WebCryptoAlgorithm algorithm;
+  const blink::WebCryptoKey key;
+  const std::vector<uint8> data;
+
+  std::vector<uint8> buffer;
+};
+
+typedef EncryptState DecryptState;
+typedef EncryptState DigestState;
+
+struct GenerateKeyState : public BaseState {
+  GenerateKeyState(const blink::WebCryptoAlgorithm& algorithm,
+                   bool extractable,
+                   blink::WebCryptoKeyUsageMask usage_mask,
+                   const blink::WebCryptoResult& result)
+      : BaseState(result),
+        algorithm(algorithm),
+        extractable(extractable),
+        usage_mask(usage_mask),
+        public_key(blink::WebCryptoKey::createNull()),
+        private_key(blink::WebCryptoKey::createNull()),
+        is_asymmetric(false) {}
+
+  const blink::WebCryptoAlgorithm algorithm;
+  const bool extractable;
+  const blink::WebCryptoKeyUsageMask usage_mask;
+
+  // If |is_asymmetric| is false, then |public_key| is understood to mean the
+  // symmetric key, and |private_key| is unused.
+  blink::WebCryptoKey public_key;
+  blink::WebCryptoKey private_key;
+  bool is_asymmetric;
+};
+
+struct ImportKeyState : public BaseState {
+  ImportKeyState(blink::WebCryptoKeyFormat format,
+                 const unsigned char* key_data,
+                 unsigned int key_data_size,
+                 const blink::WebCryptoAlgorithm& algorithm,
+                 bool extractable,
+                 blink::WebCryptoKeyUsageMask usage_mask,
+                 const blink::WebCryptoResult& result)
+      : BaseState(result),
+        format(format),
+        key_data(key_data, key_data + key_data_size),
+        algorithm(algorithm),
+        extractable(extractable),
+        usage_mask(usage_mask),
+        key(blink::WebCryptoKey::createNull()) {}
+
+  const blink::WebCryptoKeyFormat format;
+  const std::vector<uint8> key_data;
+  const blink::WebCryptoAlgorithm algorithm;
+  const bool extractable;
+  const blink::WebCryptoKeyUsageMask usage_mask;
+
+  blink::WebCryptoKey key;
+};
+
+struct ExportKeyState : public BaseState {
+  ExportKeyState(blink::WebCryptoKeyFormat format,
+                 const blink::WebCryptoKey& key,
+                 const blink::WebCryptoResult& result)
+      : BaseState(result), format(format), key(key) {}
+
+  const blink::WebCryptoKeyFormat format;
+  const blink::WebCryptoKey key;
+
+  std::vector<uint8> buffer;
+};
+
+typedef EncryptState SignState;
+
+struct VerifySignatureState : public BaseState {
+  VerifySignatureState(const blink::WebCryptoAlgorithm& algorithm,
+                       const blink::WebCryptoKey& key,
+                       const unsigned char* signature,
+                       unsigned int signature_size,
+                       const unsigned char* data,
+                       unsigned int data_size,
+                       const blink::WebCryptoResult& result)
+      : BaseState(result),
+        algorithm(algorithm),
+        key(key),
+        signature(signature, signature + signature_size),
+        data(data, data + data_size),
+        verify_result(false) {}
+
+  const blink::WebCryptoAlgorithm algorithm;
+  const blink::WebCryptoKey key;
+  const std::vector<uint8> signature;
+  const std::vector<uint8> data;
+
+  bool verify_result;
+};
+
+struct WrapKeyState : public BaseState {
+  WrapKeyState(blink::WebCryptoKeyFormat format,
+               const blink::WebCryptoKey& key,
+               const blink::WebCryptoKey& wrapping_key,
+               const blink::WebCryptoAlgorithm& wrap_algorithm,
+               const blink::WebCryptoResult& result)
+      : BaseState(result),
+        format(format),
+        key(key),
+        wrapping_key(wrapping_key),
+        wrap_algorithm(wrap_algorithm) {}
+
+  const blink::WebCryptoKeyFormat format;
+  const blink::WebCryptoKey key;
+  const blink::WebCryptoKey wrapping_key;
+  const blink::WebCryptoAlgorithm wrap_algorithm;
+
+  std::vector<uint8> buffer;
+};
+
+struct UnwrapKeyState : public BaseState {
+  UnwrapKeyState(blink::WebCryptoKeyFormat format,
+                 const unsigned char* wrapped_key,
+                 unsigned wrapped_key_size,
+                 const blink::WebCryptoKey& wrapping_key,
+                 const blink::WebCryptoAlgorithm& unwrap_algorithm,
+                 const blink::WebCryptoAlgorithm& unwrapped_key_algorithm,
+                 bool extractable,
+                 blink::WebCryptoKeyUsageMask usages,
+                 const blink::WebCryptoResult& result)
+      : BaseState(result),
+        format(format),
+        wrapped_key(wrapped_key, wrapped_key + wrapped_key_size),
+        wrapping_key(wrapping_key),
+        unwrap_algorithm(unwrap_algorithm),
+        unwrapped_key_algorithm(unwrapped_key_algorithm),
+        extractable(extractable),
+        usages(usages),
+        unwrapped_key(blink::WebCryptoKey::createNull()) {}
+
+  const blink::WebCryptoKeyFormat format;
+  const std::vector<uint8> wrapped_key;
+  const blink::WebCryptoKey wrapping_key;
+  const blink::WebCryptoAlgorithm unwrap_algorithm;
+  const blink::WebCryptoAlgorithm unwrapped_key_algorithm;
+  const bool extractable;
+  const blink::WebCryptoKeyUsageMask usages;
+
+  blink::WebCryptoKey unwrapped_key;
+};
+
+// --------------------------------------------------------------------
+// Wrapper functions
+// --------------------------------------------------------------------
+//
+// * The methods named Do*() run on the crypto thread.
+// * The methods named Do*Reply() run on the target Blink thread
+
+template <typename State>
+void DoReplyWithBuffer(State* state) {
+  CompleteWithBuffer(state->buffer, &state->result);
+}
+
+Status DoEncrypt(EncryptState* state) {
+  return webcrypto::Encrypt(state->algorithm,
+                            state->key,
+                            webcrypto::CryptoData(state->data),
+                            &state->buffer);
+}
+
+Status DoDecrypt(DecryptState* state) {
+  return webcrypto::Decrypt(state->algorithm,
+                            state->key,
+                            webcrypto::CryptoData(state->data),
+                            &state->buffer);
+}
+
+Status DoDigest(DigestState* state) {
+  return webcrypto::Digest(
+      state->algorithm, webcrypto::CryptoData(state->data), &state->buffer);
+}
+
+void DoGenerateKeyReply(GenerateKeyState* state) {
+  if (state->is_asymmetric)
+    state->result.completeWithKeyPair(state->public_key, state->private_key);
+  else
+    state->result.completeWithKey(state->public_key);
+}
+
+Status DoGenerateKey(GenerateKeyState* state) {
+  state->is_asymmetric = IsAlgorithmAsymmetric(state->algorithm);
+  if (state->is_asymmetric) {
+    Status status = webcrypto::GenerateKeyPair(state->algorithm,
+                                               state->extractable,
+                                               state->usage_mask,
+                                               &state->public_key,
+                                               &state->private_key);
+
+    if (status.IsSuccess()) {
+      DCHECK(state->public_key.handle());
+      DCHECK(state->private_key.handle());
+      DCHECK_EQ(state->algorithm.id(), state->public_key.algorithm().id());
+      DCHECK_EQ(state->algorithm.id(), state->private_key.algorithm().id());
+      DCHECK_EQ(true, state->public_key.extractable());
+      DCHECK_EQ(state->extractable, state->private_key.extractable());
+      DCHECK_EQ(state->usage_mask, state->public_key.usages());
+      DCHECK_EQ(state->usage_mask, state->private_key.usages());
+    }
+
+    return status;
+  }
+
+  blink::WebCryptoKey* key = &state->public_key;
+
+  Status status = webcrypto::GenerateSecretKey(
+      state->algorithm, state->extractable, state->usage_mask, key);
+
+  if (status.IsSuccess()) {
+    DCHECK(key->handle());
+    DCHECK_EQ(state->algorithm.id(), key->algorithm().id());
+    DCHECK_EQ(state->extractable, key->extractable());
+    DCHECK_EQ(state->usage_mask, key->usages());
+  }
+
+  return status;
+}
+
+void DoImportKeyReply(ImportKeyState* state) {
+  state->result.completeWithKey(state->key);
+}
+
+Status DoImportKey(ImportKeyState* state) {
+  Status status = webcrypto::ImportKey(state->format,
+                                       webcrypto::CryptoData(state->key_data),
+                                       state->algorithm,
+                                       state->extractable,
+                                       state->usage_mask,
+                                       &state->key);
+  if (status.IsSuccess()) {
+    DCHECK(state->key.handle());
+    DCHECK(!state->key.algorithm().isNull());
+    DCHECK_EQ(state->extractable, state->key.extractable());
+  }
+
+  return status;
+}
+
+Status DoExportKey(ExportKeyState* state) {
+  return webcrypto::ExportKey(state->format, state->key, &state->buffer);
+}
+
+Status DoSign(SignState* state) {
+  return webcrypto::Sign(state->algorithm,
+                         state->key,
+                         webcrypto::CryptoData(state->data),
+                         &state->buffer);
+}
+
+void DoVerifyReply(VerifySignatureState* state) {
+  state->result.completeWithBoolean(state->verify_result);
+}
+
+Status DoVerify(VerifySignatureState* state) {
+  return webcrypto::VerifySignature(state->algorithm,
+                                    state->key,
+                                    webcrypto::CryptoData(state->signature),
+                                    webcrypto::CryptoData(state->data),
+                                    &state->verify_result);
+}
+
+Status DoWrapKey(WrapKeyState* state) {
+  // TODO(eroman): The parameter ordering of webcrypto::WrapKey() is
+  //               inconsistent with that of blink::WebCrypto::wrapKey().
+  return webcrypto::WrapKey(state->format,
+                            state->wrapping_key,
+                            state->key,
+                            state->wrap_algorithm,
+                            &state->buffer);
+}
+
+void DoUnwrapKeyReply(UnwrapKeyState* state) {
+  state->result.completeWithKey(state->unwrapped_key);
+}
+
+Status DoUnwrapKey(UnwrapKeyState* state) {
+  return webcrypto::UnwrapKey(state->format,
+                              webcrypto::CryptoData(state->wrapped_key),
+                              state->wrapping_key,
+                              state->unwrap_algorithm,
+                              state->unwrapped_key_algorithm,
+                              state->extractable,
+                              state->usages,
+                              &state->unwrapped_key);
+}
+
 }  // namespace
 
-WebCryptoImpl::WebCryptoImpl() { webcrypto::Init(); }
+WebCryptoImpl::WebCryptoImpl() {
+  webcrypto::Init();
+}
 
-WebCryptoImpl::~WebCryptoImpl() {}
+WebCryptoImpl::~WebCryptoImpl() {
+}
 
 void WebCryptoImpl::encrypt(const blink::WebCryptoAlgorithm& algorithm,
                             const blink::WebCryptoKey& key,
                             const unsigned char* data,
                             unsigned int data_size,
                             blink::WebCryptoResult result) {
-  DCHECK(!algorithm.isNull());
-  blink::WebArrayBuffer buffer;
-  Status status = webcrypto::Encrypt(
-      algorithm, key, webcrypto::CryptoData(data, data_size), &buffer);
-  if (status.IsError())
-    CompleteWithError(status, &result);
-  else
-    result.completeWithBuffer(buffer);
+  scoped_ptr<EncryptState> state(
+      new EncryptState(algorithm, key, data, data_size, result));
+  PostToCryptoThreadAndReply(
+      FROM_HERE, &DoEncrypt, &DoReplyWithBuffer<EncryptState>, state.Pass());
 }
 
 void WebCryptoImpl::decrypt(const blink::WebCryptoAlgorithm& algorithm,
@@ -69,67 +558,30 @@ void WebCryptoImpl::decrypt(const blink::WebCryptoAlgorithm& algorithm,
                             const unsigned char* data,
                             unsigned int data_size,
                             blink::WebCryptoResult result) {
-  DCHECK(!algorithm.isNull());
-  blink::WebArrayBuffer buffer;
-  Status status = webcrypto::Decrypt(
-      algorithm, key, webcrypto::CryptoData(data, data_size), &buffer);
-  if (status.IsError())
-    CompleteWithError(status, &result);
-  else
-    result.completeWithBuffer(buffer);
+  scoped_ptr<DecryptState> state(
+      new DecryptState(algorithm, key, data, data_size, result));
+  PostToCryptoThreadAndReply(
+      FROM_HERE, &DoDecrypt, &DoReplyWithBuffer<DecryptState>, state.Pass());
 }
 
 void WebCryptoImpl::digest(const blink::WebCryptoAlgorithm& algorithm,
                            const unsigned char* data,
                            unsigned int data_size,
                            blink::WebCryptoResult result) {
-  DCHECK(!algorithm.isNull());
-  blink::WebArrayBuffer buffer;
-  Status status = webcrypto::Digest(
-      algorithm, webcrypto::CryptoData(data, data_size), &buffer);
-  if (status.IsError())
-    CompleteWithError(status, &result);
-  else
-    result.completeWithBuffer(buffer);
+  scoped_ptr<DigestState> state(new DigestState(
+      algorithm, blink::WebCryptoKey::createNull(), data, data_size, result));
+  PostToCryptoThreadAndReply(
+      FROM_HERE, &DoDigest, &DoReplyWithBuffer<DigestState>, state.Pass());
 }
 
 void WebCryptoImpl::generateKey(const blink::WebCryptoAlgorithm& algorithm,
                                 bool extractable,
                                 blink::WebCryptoKeyUsageMask usage_mask,
                                 blink::WebCryptoResult result) {
-  DCHECK(!algorithm.isNull());
-  if (IsAlgorithmAsymmetric(algorithm)) {
-    blink::WebCryptoKey public_key = blink::WebCryptoKey::createNull();
-    blink::WebCryptoKey private_key = blink::WebCryptoKey::createNull();
-    Status status = webcrypto::GenerateKeyPair(
-        algorithm, extractable, usage_mask, &public_key, &private_key);
-    if (status.IsError()) {
-      CompleteWithError(status, &result);
-    } else {
-      DCHECK(public_key.handle());
-      DCHECK(private_key.handle());
-      DCHECK_EQ(algorithm.id(), public_key.algorithm().id());
-      DCHECK_EQ(algorithm.id(), private_key.algorithm().id());
-      DCHECK_EQ(true, public_key.extractable());
-      DCHECK_EQ(extractable, private_key.extractable());
-      DCHECK_EQ(usage_mask, public_key.usages());
-      DCHECK_EQ(usage_mask, private_key.usages());
-      result.completeWithKeyPair(public_key, private_key);
-    }
-  } else {
-    blink::WebCryptoKey key = blink::WebCryptoKey::createNull();
-    Status status =
-        webcrypto::GenerateSecretKey(algorithm, extractable, usage_mask, &key);
-    if (status.IsError()) {
-      CompleteWithError(status, &result);
-    } else {
-      DCHECK(key.handle());
-      DCHECK_EQ(algorithm.id(), key.algorithm().id());
-      DCHECK_EQ(extractable, key.extractable());
-      DCHECK_EQ(usage_mask, key.usages());
-      result.completeWithKey(key);
-    }
-  }
+  scoped_ptr<GenerateKeyState> state(
+      new GenerateKeyState(algorithm, extractable, usage_mask, result));
+  PostToCryptoThreadAndReply(
+      FROM_HERE, &DoGenerateKey, &DoGenerateKeyReply, state.Pass());
 }
 
 void WebCryptoImpl::importKey(blink::WebCryptoKeyFormat format,
@@ -139,33 +591,25 @@ void WebCryptoImpl::importKey(blink::WebCryptoKeyFormat format,
                               bool extractable,
                               blink::WebCryptoKeyUsageMask usage_mask,
                               blink::WebCryptoResult result) {
-  blink::WebCryptoKey key = blink::WebCryptoKey::createNull();
-  Status status =
-      webcrypto::ImportKey(format,
-                           webcrypto::CryptoData(key_data, key_data_size),
-                           algorithm,
-                           extractable,
-                           usage_mask,
-                           &key);
-  if (status.IsError()) {
-    CompleteWithError(status, &result);
-  } else {
-    DCHECK(key.handle());
-    DCHECK(!key.algorithm().isNull());
-    DCHECK_EQ(extractable, key.extractable());
-    result.completeWithKey(key);
-  }
+  scoped_ptr<ImportKeyState> state(new ImportKeyState(format,
+                                                      key_data,
+                                                      key_data_size,
+                                                      algorithm,
+                                                      extractable,
+                                                      usage_mask,
+                                                      result));
+  PostToCryptoThreadAndReply(
+      FROM_HERE, &DoImportKey, &DoImportKeyReply, state.Pass());
 }
 
 void WebCryptoImpl::exportKey(blink::WebCryptoKeyFormat format,
                               const blink::WebCryptoKey& key,
                               blink::WebCryptoResult result) {
-  blink::WebArrayBuffer buffer;
-  Status status = webcrypto::ExportKey(format, key, &buffer);
-  if (status.IsError())
-    CompleteWithError(status, &result);
-  else
-    result.completeWithBuffer(buffer);
+  scoped_ptr<ExportKeyState> state(new ExportKeyState(format, key, result));
+  PostToCryptoThreadAndReply(FROM_HERE,
+                             &DoExportKey,
+                             &DoReplyWithBuffer<ExportKeyState>,
+                             state.Pass());
 }
 
 void WebCryptoImpl::sign(const blink::WebCryptoAlgorithm& algorithm,
@@ -173,14 +617,10 @@ void WebCryptoImpl::sign(const blink::WebCryptoAlgorithm& algorithm,
                          const unsigned char* data,
                          unsigned int data_size,
                          blink::WebCryptoResult result) {
-  DCHECK(!algorithm.isNull());
-  blink::WebArrayBuffer buffer;
-  Status status = webcrypto::Sign(
-      algorithm, key, webcrypto::CryptoData(data, data_size), &buffer);
-  if (status.IsError())
-    CompleteWithError(status, &result);
-  else
-    result.completeWithBuffer(buffer);
+  scoped_ptr<SignState> state(
+      new SignState(algorithm, key, data, data_size, result));
+  PostToCryptoThreadAndReply(
+      FROM_HERE, &DoSign, &DoReplyWithBuffer<SignState>, state.Pass());
 }
 
 void WebCryptoImpl::verifySignature(const blink::WebCryptoAlgorithm& algorithm,
@@ -190,18 +630,10 @@ void WebCryptoImpl::verifySignature(const blink::WebCryptoAlgorithm& algorithm,
                                     const unsigned char* data,
                                     unsigned int data_size,
                                     blink::WebCryptoResult result) {
-  DCHECK(!algorithm.isNull());
-  bool signature_match = false;
-  Status status = webcrypto::VerifySignature(
-      algorithm,
-      key,
-      webcrypto::CryptoData(signature, signature_size),
-      webcrypto::CryptoData(data, data_size),
-      &signature_match);
-  if (status.IsError())
-    CompleteWithError(status, &result);
-  else
-    result.completeWithBoolean(signature_match);
+  scoped_ptr<VerifySignatureState> state(new VerifySignatureState(
+      algorithm, key, signature, signature_size, data, data_size, result));
+  PostToCryptoThreadAndReply(
+      FROM_HERE, &DoVerify, &DoVerifyReply, state.Pass());
 }
 
 void WebCryptoImpl::wrapKey(blink::WebCryptoKeyFormat format,
@@ -209,14 +641,10 @@ void WebCryptoImpl::wrapKey(blink::WebCryptoKeyFormat format,
                             const blink::WebCryptoKey& wrapping_key,
                             const blink::WebCryptoAlgorithm& wrap_algorithm,
                             blink::WebCryptoResult result) {
-  blink::WebArrayBuffer buffer;
-  // TODO(eroman): Use the same parameter ordering.
-  Status status = webcrypto::WrapKey(
-      format, wrapping_key, key, wrap_algorithm, &buffer);
-  if (status.IsError())
-    CompleteWithError(status, &result);
-  else
-    result.completeWithBuffer(buffer);
+  scoped_ptr<WrapKeyState> state(
+      new WrapKeyState(format, key, wrapping_key, wrap_algorithm, result));
+  PostToCryptoThreadAndReply(
+      FROM_HERE, &DoWrapKey, &DoReplyWithBuffer<WrapKeyState>, state.Pass());
 }
 
 void WebCryptoImpl::unwrapKey(
@@ -229,32 +657,17 @@ void WebCryptoImpl::unwrapKey(
     bool extractable,
     blink::WebCryptoKeyUsageMask usages,
     blink::WebCryptoResult result) {
-  blink::WebCryptoKey key = blink::WebCryptoKey::createNull();
-  Status status =
-      webcrypto::UnwrapKey(format,
-                           webcrypto::CryptoData(wrapped_key, wrapped_key_size),
-                           wrapping_key,
-                           unwrap_algorithm,
-                           unwrapped_key_algorithm,
-                           extractable,
-                           usages,
-                           &key);
-  if (status.IsError())
-    CompleteWithError(status, &result);
-  else
-    result.completeWithKey(key);
-}
-
-bool WebCryptoImpl::digestSynchronous(
-    const blink::WebCryptoAlgorithmId algorithm_id,
-    const unsigned char* data,
-    unsigned int data_size,
-    blink::WebArrayBuffer& result) {
-  blink::WebCryptoAlgorithm algorithm =
-      blink::WebCryptoAlgorithm::adoptParamsAndCreate(algorithm_id, NULL);
-  return (webcrypto::Digest(
-              algorithm, webcrypto::CryptoData(data, data_size), &result))
-      .IsSuccess();
+  scoped_ptr<UnwrapKeyState> state(new UnwrapKeyState(format,
+                                                      wrapped_key,
+                                                      wrapped_key_size,
+                                                      wrapping_key,
+                                                      unwrap_algorithm,
+                                                      unwrapped_key_algorithm,
+                                                      extractable,
+                                                      usages,
+                                                      result));
+  PostToCryptoThreadAndReply(
+      FROM_HERE, &DoUnwrapKey, &DoUnwrapKeyReply, state.Pass());
 }
 
 blink::WebCryptoDigestor* WebCryptoImpl::createDigestor(
@@ -270,21 +683,21 @@ bool WebCryptoImpl::deserializeKeyForClone(
     const unsigned char* key_data,
     unsigned key_data_size,
     blink::WebCryptoKey& key) {
-  Status status = webcrypto::DeserializeKeyForClone(
+  // TODO(eroman): Rather than do the import immediately on the current thread,
+  //               it could defer to the crypto thread.
+  return webcrypto::DeserializeKeyForClone(
       algorithm,
       type,
       extractable,
       usages,
       webcrypto::CryptoData(key_data, key_data_size),
       &key);
-  return status.IsSuccess();
 }
 
 bool WebCryptoImpl::serializeKeyForClone(
     const blink::WebCryptoKey& key,
     blink::WebVector<unsigned char>& key_data) {
-  Status status = webcrypto::SerializeKeyForClone(key, &key_data);
-  return status.IsSuccess();
+  return webcrypto::SerializeKeyForClone(key, &key_data);
 }
 
 }  // namespace content