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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/audio_decoder_selector_unittest.cc

Issue 1446713003: Revert of media: Pass SetCdmReadyCB in {Audio|Video}Decoder::Initialize(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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/base/video_decoder.h ('k') | media/filters/audio_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_decoder_selector_unittest.cc
diff --git a/media/filters/audio_decoder_selector_unittest.cc b/media/filters/audio_decoder_selector_unittest.cc
index 2f5adaaeaafcd56e3b8a845b378eec74c45d9bbb..b2b8a8a66cfbd6f18a1d23c0ff62c058cebdfbf9 100644
--- a/media/filters/audio_decoder_selector_unittest.cc
+++ b/media/filters/audio_decoder_selector_unittest.cc
@@ -208,8 +208,8 @@
UseClearStream();
InitializeDecoderSelector(kNoDecryptor, 1);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _))
+ .WillOnce(RunCallback<1>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));
SelectDecoder();
@@ -220,7 +220,7 @@
UseClearStream();
InitializeDecoderSelector(kNoDecryptor, 1);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _));
SelectDecoderAndDestroy();
}
@@ -231,10 +231,10 @@
UseClearStream();
InitializeDecoderSelector(kNoDecryptor, 2);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _))
+ .WillOnce(RunCallback<1>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _))
+ .WillOnce(RunCallback<1>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull()));
SelectDecoder();
@@ -245,9 +245,9 @@
UseClearStream();
InitializeDecoderSelector(kNoDecryptor, 2);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _))
+ .WillOnce(RunCallback<1>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _));
SelectDecoderAndDestroy();
}
@@ -258,8 +258,8 @@
UseClearStream();
InitializeDecoderSelector(kDecryptOnly, 1);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _))
+ .WillOnce(RunCallback<1>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, IsNull()));
SelectDecoder();
@@ -269,7 +269,7 @@
UseClearStream();
InitializeDecoderSelector(kDecryptOnly, 1);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _));
SelectDecoderAndDestroy();
}
@@ -280,8 +280,8 @@
UseEncryptedStream();
InitializeDecoderSelector(kNoDecryptor, 1);
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
+ EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _))
+ .WillOnce(RunCallback<1>(false));
EXPECT_CALL(*this, OnDecoderSelected(IsNull(), IsNull()));
SelectDecoder();
@@ -292,7 +292,7 @@
UseEncryptedStream();
InitializeDecoderSelector(kNoDecryptor, 1);
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _));
SelectDecoderAndDestroy();
}
@@ -303,10 +303,10 @@
UseEncryptedStream();
InitializeDecoderSelector(kNoDecryptor, 2);
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _))
+ .WillOnce(RunCallback<1>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _))
+ .WillOnce(RunCallback<1>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, IsNull()));
SelectDecoder();
@@ -317,9 +317,9 @@
UseEncryptedStream();
InitializeDecoderSelector(kNoDecryptor, 2);
- EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(EncryptedConfig(), _, _))
+ .WillOnce(RunCallback<1>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(EncryptedConfig(), _, _));
SelectDecoderAndDestroy();
}
@@ -349,8 +349,8 @@
UseEncryptedStream();
InitializeDecoderSelector(kDecryptOnly, 1);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _))
+ .WillOnce(RunCallback<1>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_1_, NotNull()));
SelectDecoder();
@@ -361,7 +361,7 @@
UseEncryptedStream();
InitializeDecoderSelector(kDecryptOnly, 1);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _));
SelectDecoderAndDestroy();
}
@@ -374,10 +374,10 @@
UseEncryptedStream();
InitializeDecoderSelector(kDecryptOnly, 2);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _))
+ .WillOnce(RunCallback<1>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _))
+ .WillOnce(RunCallback<1>(true));
EXPECT_CALL(*this, OnDecoderSelected(decoder_2_, NotNull()));
SelectDecoder();
@@ -388,9 +388,9 @@
UseEncryptedStream();
InitializeDecoderSelector(kDecryptOnly, 2);
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(false));
- EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _, _));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _))
+ .WillOnce(RunCallback<1>(false));
+ EXPECT_CALL(*decoder_2_, Initialize(ClearConfig(), _, _));
SelectDecoderAndDestroy();
}
@@ -408,8 +408,8 @@
#else
// A DecryptingDemuxerStream will be created. The clear decoder will be
// initialized and returned.
- EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _, _))
- .WillOnce(RunCallback<2>(true));
+ EXPECT_CALL(*decoder_1_, Initialize(ClearConfig(), _, _))
+ .WillOnce(RunCallback<1>(true));
EXPECT_CALL(*this, OnDecoderSelected(NotNull(), NotNull()));
#endif
« no previous file with comments | « media/base/video_decoder.h ('k') | media/filters/audio_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698