Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1942)

Unified Diff: media/filters/decrypting_video_decoder_unittest.cc

Issue 11342031: Add DecryptingDemuxerStream. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/decrypting_video_decoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decrypting_video_decoder_unittest.cc
diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc
index aa06d411687fe1c3c20ff9f07d29bd8c6fe3d98f..f1991d069ce32e022945bdbeea9bb0bc8acd8c40 100644
--- a/media/filters/decrypting_video_decoder_unittest.cc
+++ b/media/filters/decrypting_video_decoder_unittest.cc
@@ -20,7 +20,6 @@
using ::testing::_;
using ::testing::AtMost;
-using ::testing::Invoke;
using ::testing::IsNull;
using ::testing::ReturnRef;
using ::testing::SaveArg;
@@ -74,7 +73,7 @@ MATCHER(IsEndOfStream, "end of stream") {
class DecryptingVideoDecoderTest : public testing::Test {
public:
DecryptingVideoDecoderTest()
- : decoder_(new StrictMock<DecryptingVideoDecoder>(
+ : decoder_(new DecryptingVideoDecoder(
base::Bind(&Identity<scoped_refptr<base::MessageLoopProxy> >,
message_loop_.message_loop_proxy()),
base::Bind(
@@ -239,7 +238,7 @@ class DecryptingVideoDecoderTest : public testing::Test {
const scoped_refptr<VideoFrame>&));
MessageLoop message_loop_;
- scoped_refptr<StrictMock<DecryptingVideoDecoder> > decoder_;
+ scoped_refptr<DecryptingVideoDecoder> decoder_;
scoped_ptr<StrictMock<MockDecryptor> > decryptor_;
scoped_refptr<StrictMock<MockDemuxerStream> > demuxer_;
MockStatisticsCB statistics_cb_;
« no previous file with comments | « media/filters/decrypting_video_decoder.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698