Encrypted Media: No need to cancel NewKeyCB during tear down.

media/filters/decrypting_audio_decoder.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 "media/filters/decrypting_audio_decoder.h"
 
 #include <cstdlib>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 136 matching lines @@
 
 void DecryptingAudioDecoder::Stop(const base::Closure& closure) {
   DVLOG(2) << "Stop() - state: " << state_;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Invalidate all weak pointers so that pending callbacks won't be fired into
   // this object.
   weak_factory_.InvalidateWeakPtrs();
 
   if (decryptor_) {
-    decryptor_->RegisterNewKeyCB(Decryptor::kAudio, Decryptor::NewKeyCB());
     decryptor_->DeinitializeDecoder(Decryptor::kAudio);
     decryptor_ = NULL;
   }
   if (!set_decryptor_ready_cb_.is_null())
     base::ResetAndReturn(&set_decryptor_ready_cb_).Run(DecryptorReadyCB());
   pending_buffer_to_decode_ = NULL;
   if (!init_cb_.is_null())
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
   if (!read_cb_.is_null())
     base::ResetAndReturn(&read_cb_).Run(kAborted, NULL);
@@ skipping 73 matching lines @@
   if (!success) {
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
     state_ = kStopped;
     return;
   }
 
   // Success!
   UpdateDecoderConfig();
 
   decryptor_->RegisterNewKeyCB(
-      Decryptor::kAudio, BindToCurrentLoop(base::Bind(
-          &DecryptingAudioDecoder::OnKeyAdded, weak_this_)));
+      Decryptor::kAudio,
+      BindToCurrentLoop(
+          base::Bind(&DecryptingAudioDecoder::OnKeyAdded, weak_this_)));
 
   state_ = kIdle;
   base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);
 }
 
 void DecryptingAudioDecoder::FinishConfigChange(bool success) {
   DVLOG(2) << "FinishConfigChange()";
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kPendingConfigChange) << state_;
   DCHECK(!read_cb_.is_null());
@@ skipping 232 matching lines @@
     }
 
     frame->set_timestamp(current_time);
     frame->set_duration(
         timestamp_helper_->GetFrameDuration(frame->frame_count()));
     timestamp_helper_->AddFrames(frame->frame_count());
   }
 }
 
 }  // namespace media