Call Decryptor::Stop() in FFmpegVideoDecoder::Reset().

webkit/media/crypto/proxy_decryptor.cc

 // Copyright (c) 2012 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 "webkit/media/crypto/proxy_decryptor.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 148 matching lines @@
       FireNeedKey(client_, encrypted);
       return;
     }
   }
 
   decryptor->Decrypt(encrypted, base::Bind(
       &ProxyDecryptor::OnBufferDecrypted, base::Unretained(this),
       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);
   }
 
   for (std::vector<base::Closure>::iterator iter = closures_to_run.begin();
        iter != closures_to_run.end();
        ++iter) {
     iter->Run();
   }
 }
@@ skipping 82 matching lines @@
         &ProxyDecryptor::DecryptOnMessageLoop, base::Unretained(this),
         message_loop_proxy, encrypted, decrypt_cb));
   }
   // TODO(xhwang): The same NeedKey may be fired multiple times here and also
   // in Decrypt(). While the spec says only one NeedKey should be fired. Leave
   // them as is since the spec about this may change.
   FireNeedKey(client_, encrypted);
 }
 
 }  // namespace webkit_media