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

Unified Diff: media/base/audio_renderer_mixer_unittest.cc

Issue 16297002: Update media/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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
« no previous file with comments | « media/base/audio_renderer_mixer_input_unittest.cc ('k') | media/base/data_buffer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/audio_renderer_mixer_unittest.cc
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc
index 8680b788c663150b01e1fca26352f6e661820600..a0a34f3f4758ca9a95fd5d2ad365bd76f5b4fb39 100644
--- a/media/base/audio_renderer_mixer_unittest.cc
+++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -52,8 +52,8 @@ class AudioRendererMixerTest
std::tr1::get<1>(GetParam()), 16, kLowLatencyBufferSize);
sink_ = new MockAudioRendererSink();
- EXPECT_CALL(*sink_, Start());
- EXPECT_CALL(*sink_, Stop());
+ EXPECT_CALL(*sink_.get(), Start());
+ EXPECT_CALL(*sink_.get(), Stop());
mixer_.reset(new AudioRendererMixer(
input_parameters_, output_parameters_, sink_));
@@ -415,8 +415,8 @@ TEST_P(AudioRendererMixerBehavioralTest, MixerPausesStream) {
mixer_->set_pause_delay_for_testing(kPauseTime);
base::WaitableEvent pause_event(true, false);
- EXPECT_CALL(*sink_, Pause())
- .Times(2).WillRepeatedly(SignalEvent(&pause_event));
+ EXPECT_CALL(*sink_.get(), Pause()).Times(2)
+ .WillRepeatedly(SignalEvent(&pause_event));
InitializeInputs(1);
// Ensure never playing the input results in a sink pause.
@@ -431,7 +431,7 @@ TEST_P(AudioRendererMixerBehavioralTest, MixerPausesStream) {
// Playing the input for the first time should cause a sink play.
mixer_inputs_[0]->Start();
- EXPECT_CALL(*sink_, Play());
+ EXPECT_CALL(*sink_.get(), Play());
mixer_inputs_[0]->Play();
mixer_inputs_[0]->Pause();
« no previous file with comments | « media/base/audio_renderer_mixer_input_unittest.cc ('k') | media/base/data_buffer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698