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

media/filters/decrypting_demuxer_stream.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_demuxer_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 106 matching lines @@
   DCHECK(state_ != kUninitialized) << state_;
 
   // Invalidate all weak pointers so that pending callbacks won't be fired into
   // this object.
   weak_factory_.InvalidateWeakPtrs();
 
   // At this point the render thread is likely paused (in WebMediaPlayerImpl's
   // Destroy()), so running |closure| can't wait for anything that requires the
   // render thread to process messages to complete (such as PPAPI methods).
   if (decryptor_) {
-    // Clear the callback.
-    // TODO(xhwang): Since we invalidate all weak pointers during Stop(),
-    // canceling NewKeyCB seems unnecessary. Clean this up in all Decrypting*
-    // classes.
-    decryptor_->RegisterNewKeyCB(GetDecryptorStreamType(),
-                                 Decryptor::NewKeyCB());
     decryptor_->CancelDecrypt(GetDecryptorStreamType());
     decryptor_ = NULL;
   }
   if (!set_decryptor_ready_cb_.is_null())
     base::ResetAndReturn(&set_decryptor_ready_cb_).Run(DecryptorReadyCB());
   if (!init_cb_.is_null())
     base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_ABORT);
   if (!read_cb_.is_null())
     base::ResetAndReturn(&read_cb_).Run(kAborted, NULL);
   if (!reset_cb_.is_null())
@@ skipping 250 matching lines @@
       break;
     }
 
     default:
       NOTREACHED();
       return;
   }
 }
 
 }  // namespace media