Index: components/webcrypto/webcrypto_impl.cc |
diff --git a/components/webcrypto/webcrypto_impl.cc b/components/webcrypto/webcrypto_impl.cc |
index 71d4b2b26dacf2fbdf1b778e3319c9c0d623c138..0647b77d0de226a62caf8e0cb8f1c41df626b00d 100644 |
--- a/components/webcrypto/webcrypto_impl.cc |
+++ b/components/webcrypto/webcrypto_impl.cc |
@@ -385,7 +385,7 @@ void DoEncrypt(scoped_ptr<EncryptState> passed_state) { |
webcrypto::Encrypt(state->algorithm, state->key, |
webcrypto::CryptoData(state->data), &state->buffer); |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoEncryptReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoEncryptReply, base::Passed(&passed_state))); |
} |
void DoDecryptReply(scoped_ptr<DecryptState> state) { |
@@ -400,7 +400,7 @@ void DoDecrypt(scoped_ptr<DecryptState> passed_state) { |
webcrypto::Decrypt(state->algorithm, state->key, |
webcrypto::CryptoData(state->data), &state->buffer); |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoDecryptReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoDecryptReply, base::Passed(&passed_state))); |
} |
void DoDigestReply(scoped_ptr<DigestState> state) { |
@@ -414,7 +414,7 @@ void DoDigest(scoped_ptr<DigestState> passed_state) { |
state->status = webcrypto::Digest( |
state->algorithm, webcrypto::CryptoData(state->data), &state->buffer); |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoDigestReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoDigestReply, base::Passed(&passed_state))); |
} |
void DoGenerateKeyReply(scoped_ptr<GenerateKeyState> state) { |
@@ -433,7 +433,7 @@ void DoGenerateKey(scoped_ptr<GenerateKeyState> passed_state) { |
webcrypto::GenerateKey(state->algorithm, state->extractable, |
state->usages, &state->generate_key_result); |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoGenerateKeyReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoGenerateKeyReply, base::Passed(&passed_state))); |
} |
void DoImportKeyReply(scoped_ptr<ImportKeyState> state) { |
@@ -454,7 +454,7 @@ void DoImportKey(scoped_ptr<ImportKeyState> passed_state) { |
} |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoImportKeyReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoImportKeyReply, base::Passed(&passed_state))); |
} |
void DoExportKeyReply(scoped_ptr<ExportKeyState> state) { |
@@ -479,7 +479,7 @@ void DoExportKey(scoped_ptr<ExportKeyState> passed_state) { |
state->status = |
webcrypto::ExportKey(state->format, state->key, &state->buffer); |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoExportKeyReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoExportKeyReply, base::Passed(&passed_state))); |
} |
void DoSignReply(scoped_ptr<SignState> state) { |
@@ -495,7 +495,7 @@ void DoSign(scoped_ptr<SignState> passed_state) { |
webcrypto::CryptoData(state->data), &state->buffer); |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoSignReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoSignReply, base::Passed(&passed_state))); |
} |
void DoVerifyReply(scoped_ptr<VerifySignatureState> state) { |
@@ -515,7 +515,7 @@ void DoVerify(scoped_ptr<VerifySignatureState> passed_state) { |
webcrypto::CryptoData(state->data), &state->verify_result); |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoVerifyReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoVerifyReply, base::Passed(&passed_state))); |
} |
void DoWrapKeyReply(scoped_ptr<WrapKeyState> state) { |
@@ -531,7 +531,7 @@ void DoWrapKey(scoped_ptr<WrapKeyState> passed_state) { |
state->wrap_algorithm, &state->buffer); |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoWrapKeyReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoWrapKeyReply, base::Passed(&passed_state))); |
} |
void DoUnwrapKeyReply(scoped_ptr<UnwrapKeyState> state) { |
@@ -549,7 +549,7 @@ void DoUnwrapKey(scoped_ptr<UnwrapKeyState> passed_state) { |
&state->unwrapped_key); |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoUnwrapKeyReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoUnwrapKeyReply, base::Passed(&passed_state))); |
} |
void DoDeriveBitsReply(scoped_ptr<DeriveBitsState> state) { |
@@ -565,7 +565,7 @@ void DoDeriveBits(scoped_ptr<DeriveBitsState> passed_state) { |
webcrypto::DeriveBits(state->algorithm, state->base_key, |
state->length_bits, &state->derived_bytes); |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoDeriveBitsReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoDeriveBitsReply, base::Passed(&passed_state))); |
} |
void DoDeriveKeyReply(scoped_ptr<DeriveKeyState> state) { |
@@ -581,7 +581,7 @@ void DoDeriveKey(scoped_ptr<DeriveKeyState> passed_state) { |
state->key_length_algorithm, state->extractable, state->usages, |
&state->derived_key); |
state->origin_thread->PostTask( |
- FROM_HERE, base::Bind(DoDeriveKeyReply, Passed(&passed_state))); |
+ FROM_HERE, base::Bind(DoDeriveKeyReply, base::Passed(&passed_state))); |
} |
} // namespace |
@@ -601,8 +601,8 @@ void WebCryptoImpl::encrypt(const blink::WebCryptoAlgorithm& algorithm, |
scoped_ptr<EncryptState> state( |
new EncryptState(algorithm, key, data, data_size, result)); |
- if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoEncrypt, Passed(&state)))) { |
+ if (!CryptoThreadPool::PostTask( |
+ FROM_HERE, base::Bind(DoEncrypt, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |
@@ -616,8 +616,8 @@ void WebCryptoImpl::decrypt(const blink::WebCryptoAlgorithm& algorithm, |
scoped_ptr<DecryptState> state( |
new DecryptState(algorithm, key, data, data_size, result)); |
- if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoDecrypt, Passed(&state)))) { |
+ if (!CryptoThreadPool::PostTask( |
+ FROM_HERE, base::Bind(DoDecrypt, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |
@@ -631,7 +631,7 @@ void WebCryptoImpl::digest(const blink::WebCryptoAlgorithm& algorithm, |
scoped_ptr<DigestState> state(new DigestState( |
algorithm, blink::WebCryptoKey::createNull(), data, data_size, result)); |
if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoDigest, Passed(&state)))) { |
+ base::Bind(DoDigest, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |
@@ -644,8 +644,8 @@ void WebCryptoImpl::generateKey(const blink::WebCryptoAlgorithm& algorithm, |
scoped_ptr<GenerateKeyState> state( |
new GenerateKeyState(algorithm, extractable, usages, result)); |
- if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoGenerateKey, Passed(&state)))) { |
+ if (!CryptoThreadPool::PostTask( |
+ FROM_HERE, base::Bind(DoGenerateKey, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |
@@ -659,8 +659,8 @@ void WebCryptoImpl::importKey(blink::WebCryptoKeyFormat format, |
blink::WebCryptoResult result) { |
scoped_ptr<ImportKeyState> state(new ImportKeyState( |
format, key_data, key_data_size, algorithm, extractable, usages, result)); |
- if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoImportKey, Passed(&state)))) { |
+ if (!CryptoThreadPool::PostTask( |
+ FROM_HERE, base::Bind(DoImportKey, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |
@@ -669,8 +669,8 @@ void WebCryptoImpl::exportKey(blink::WebCryptoKeyFormat format, |
const blink::WebCryptoKey& key, |
blink::WebCryptoResult result) { |
scoped_ptr<ExportKeyState> state(new ExportKeyState(format, key, result)); |
- if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoExportKey, Passed(&state)))) { |
+ if (!CryptoThreadPool::PostTask( |
+ FROM_HERE, base::Bind(DoExportKey, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |
@@ -683,7 +683,7 @@ void WebCryptoImpl::sign(const blink::WebCryptoAlgorithm& algorithm, |
scoped_ptr<SignState> state( |
new SignState(algorithm, key, data, data_size, result)); |
if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoSign, Passed(&state)))) { |
+ base::Bind(DoSign, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |
@@ -698,7 +698,7 @@ void WebCryptoImpl::verifySignature(const blink::WebCryptoAlgorithm& algorithm, |
scoped_ptr<VerifySignatureState> state(new VerifySignatureState( |
algorithm, key, signature, signature_size, data, data_size, result)); |
if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoVerify, Passed(&state)))) { |
+ base::Bind(DoVerify, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |
@@ -710,8 +710,8 @@ void WebCryptoImpl::wrapKey(blink::WebCryptoKeyFormat format, |
blink::WebCryptoResult result) { |
scoped_ptr<WrapKeyState> state( |
new WrapKeyState(format, key, wrapping_key, wrap_algorithm, result)); |
- if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoWrapKey, Passed(&state)))) { |
+ if (!CryptoThreadPool::PostTask( |
+ FROM_HERE, base::Bind(DoWrapKey, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |
@@ -729,8 +729,8 @@ void WebCryptoImpl::unwrapKey( |
scoped_ptr<UnwrapKeyState> state(new UnwrapKeyState( |
format, wrapped_key, wrapped_key_size, wrapping_key, unwrap_algorithm, |
unwrapped_key_algorithm, extractable, usages, result)); |
- if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoUnwrapKey, Passed(&state)))) { |
+ if (!CryptoThreadPool::PostTask( |
+ FROM_HERE, base::Bind(DoUnwrapKey, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |
@@ -741,8 +741,8 @@ void WebCryptoImpl::deriveBits(const blink::WebCryptoAlgorithm& algorithm, |
blink::WebCryptoResult result) { |
scoped_ptr<DeriveBitsState> state( |
new DeriveBitsState(algorithm, base_key, length_bits, result)); |
- if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoDeriveBits, Passed(&state)))) { |
+ if (!CryptoThreadPool::PostTask( |
+ FROM_HERE, base::Bind(DoDeriveBits, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |
@@ -758,8 +758,8 @@ void WebCryptoImpl::deriveKey( |
scoped_ptr<DeriveKeyState> state( |
new DeriveKeyState(algorithm, base_key, import_algorithm, |
key_length_algorithm, extractable, usages, result)); |
- if (!CryptoThreadPool::PostTask(FROM_HERE, |
- base::Bind(DoDeriveKey, Passed(&state)))) { |
+ if (!CryptoThreadPool::PostTask( |
+ FROM_HERE, base::Bind(DoDeriveKey, base::Passed(&state)))) { |
CompleteWithThreadPoolError(&result); |
} |
} |