| Index: webkit/media/crypto/proxy_decryptor.cc
|
| diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc
|
| index bdbabbf21fe8095577573c9c672870ae281110f3..ce01925ac5960e66d7ce4b0a3aee45d99ca371aa 100644
|
| --- a/webkit/media/crypto/proxy_decryptor.cc
|
| +++ b/webkit/media/crypto/proxy_decryptor.cc
|
| @@ -166,14 +166,14 @@ void ProxyDecryptor::Decrypt(
|
| base::MessageLoopProxy::current(), encrypted, decrypt_cb));
|
| }
|
|
|
| -void ProxyDecryptor::Stop() {
|
| +void ProxyDecryptor::CancelDecrypt() {
|
| DVLOG(1) << "Stop()";
|
|
|
| std::vector<base::Closure> closures_to_run;
|
| {
|
| base::AutoLock auto_lock(lock_);
|
| if (decryptor_.get())
|
| - decryptor_->Stop();
|
| + decryptor_->CancelDecrypt();
|
| stopped_ = true;
|
| std::swap(pending_decrypt_closures_, closures_to_run);
|
| }
|
|
|