diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 03:30:46 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-19 03:30:46 +0000 |
| commit | 76f9297286b91a0b62418189b1d57aebc0bc9b9b (patch) | |
| tree | d13d87cd2d316240910db3ed1693ca85ea30f229 /media | |
| parent | c5803bd42d6f5076a873f886c643b77e7281b55d (diff) | |
| download | chromium_src-76f9297286b91a0b62418189b1d57aebc0bc9b9b.zip chromium_src-76f9297286b91a0b62418189b1d57aebc0bc9b9b.tar.gz chromium_src-76f9297286b91a0b62418189b1d57aebc0bc9b9b.tar.bz2 | |
Reset request_decryptor_notification_cb_ after decryptor is set.
To prevent extra request_decryptor_notification_cb_ calls during Stop().
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11188066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162912 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/decrypting_video_decoder.cc | 2 | ||||
| -rw-r--r-- | media/filters/decrypting_video_decoder_unittest.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc index b820030..8ea9675 100644 --- a/media/filters/decrypting_video_decoder.cc +++ b/media/filters/decrypting_video_decoder.cc @@ -165,6 +165,8 @@ void DecryptingVideoDecoder::SetDecryptor(Decryptor* decryptor) { DCHECK_EQ(state_, kDecryptorRequested) << state_; DCHECK(!init_cb_.is_null()); + DCHECK(!request_decryptor_notification_cb_.is_null()); + request_decryptor_notification_cb_.Reset(); decryptor_ = decryptor; diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc index a2566f5..4e8970f 100644 --- a/media/filters/decrypting_video_decoder_unittest.cc +++ b/media/filters/decrypting_video_decoder_unittest.cc @@ -102,7 +102,7 @@ class DecryptingVideoDecoderTest : public testing::Test { EXPECT_CALL(*demuxer_, video_decoder_config()) .WillRepeatedly(ReturnRef(config)); EXPECT_CALL(*this, RequestDecryptorNotification(_)) - .WillRepeatedly(RunCallback0(decryptor_.get())); + .WillOnce(RunCallback0(decryptor_.get())); decoder_->Initialize(demuxer_, NewExpectedStatusCB(status), base::Bind(&MockStatisticsCB::OnStatistics, |