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

Unified Diff: media/filters/audio_renderer_impl_unittest.cc

Issue 935243002: Decryptors can report kNoKey to WebMediaPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months 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
Index: media/filters/audio_renderer_impl_unittest.cc
diff --git a/media/filters/audio_renderer_impl_unittest.cc b/media/filters/audio_renderer_impl_unittest.cc
index 3d8226835d2fb31779fd5612ee36d0f0743268d4..9e640ad109fbbd8ff749b34b30463756a5fa6db2 100644
--- a/media/filters/audio_renderer_impl_unittest.cc
+++ b/media/filters/audio_renderer_impl_unittest.cc
@@ -105,7 +105,7 @@ class AudioRendererImplTest : public ::testing::Test {
}
void ExpectUnsupportedAudioDecoder() {
- EXPECT_CALL(*decoder_, Initialize(_, _, _))
+ EXPECT_CALL(*decoder_, Initialize(_, _, _, _))
.WillOnce(DoAll(SaveArg<2>(&output_cb_),
RunCallback<1>(DECODER_ERROR_NOT_SUPPORTED)));
}
@@ -122,13 +122,13 @@ class AudioRendererImplTest : public ::testing::Test {
base::Bind(&AudioRendererImplTest::OnBufferingStateChange,
base::Unretained(this)),
base::Bind(&AudioRendererImplTest::OnEnded, base::Unretained(this)),
- base::Bind(&AudioRendererImplTest::OnError, base::Unretained(this)));
+ base::Bind(&AudioRendererImplTest::OnError, base::Unretained(this)),
+ base::Closure());
}
void Initialize() {
- EXPECT_CALL(*decoder_, Initialize(_, _, _))
- .WillOnce(DoAll(SaveArg<2>(&output_cb_),
- RunCallback<1>(PIPELINE_OK)));
+ EXPECT_CALL(*decoder_, Initialize(_, _, _, _))
+ .WillOnce(DoAll(SaveArg<2>(&output_cb_), RunCallback<1>(PIPELINE_OK)));
InitializeWithStatus(PIPELINE_OK);
next_timestamp_.reset(new AudioTimestampHelper(kInputSamplesPerSecond));
@@ -146,7 +146,7 @@ class AudioRendererImplTest : public ::testing::Test {
}
void InitializeAndDestroy() {
- EXPECT_CALL(*decoder_, Initialize(_, _, _))
+ EXPECT_CALL(*decoder_, Initialize(_, _, _, _))
.WillOnce(RunCallback<1>(PIPELINE_OK));
WaitableMessageLoopEvent event;
@@ -160,7 +160,7 @@ class AudioRendererImplTest : public ::testing::Test {
}
void InitializeAndDestroyDuringDecoderInit() {
- EXPECT_CALL(*decoder_, Initialize(_, _, _))
+ EXPECT_CALL(*decoder_, Initialize(_, _, _, _))
.WillOnce(EnterPendingDecoderInitStateAction(this));
WaitableMessageLoopEvent event;

Powered by Google App Engine
This is Rietveld 408576698