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

Unified Diff: content/renderer/media/audio_renderer_mixer_manager_unittest.cc

Issue 16294003: Update content/ 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 | « content/renderer/gpu/render_widget_compositor.cc ('k') | content/renderer/media/media_stream_center.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/audio_renderer_mixer_manager_unittest.cc
diff --git a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
index 900162fa5b26d6b5f59c86b9e986e87d90c1528e..40b0c8ca21d6d620854336ad8bd73287e2a0ff8e 100644
--- a/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
+++ b/content/renderer/media/audio_renderer_mixer_manager_unittest.cc
@@ -44,7 +44,7 @@ class AudioRendererMixerManagerTest : public testing::Test {
// We don't want to deal with instantiating a real AudioOutputDevice since
// it's not important to our testing, so we inject a mock.
mock_sink_ = new media::MockAudioRendererSink();
- manager_->SetAudioRendererSinkForTesting(mock_sink_);
+ manager_->SetAudioRendererSinkForTesting(mock_sink_.get());
}
media::AudioRendererMixer* GetMixer(int source_render_view_id,
@@ -75,8 +75,8 @@ class AudioRendererMixerManagerTest : public testing::Test {
TEST_F(AudioRendererMixerManagerTest, GetRemoveMixer) {
// Since we're testing two different sets of parameters, we expect
// AudioRendererMixerManager to call Start and Stop on our mock twice.
- EXPECT_CALL(*mock_sink_, Start()).Times(2);
- EXPECT_CALL(*mock_sink_, Stop()).Times(2);
+ EXPECT_CALL(*mock_sink_.get(), Start()).Times(2);
+ EXPECT_CALL(*mock_sink_.get(), Stop()).Times(2);
// There should be no mixers outstanding to start with.
EXPECT_EQ(mixer_count(), 0);
@@ -121,8 +121,8 @@ TEST_F(AudioRendererMixerManagerTest, GetRemoveMixer) {
TEST_F(AudioRendererMixerManagerTest, CreateInput) {
// Expect AudioRendererMixerManager to call Start and Stop on our mock twice
// each. Note: Under normal conditions, each mixer would get its own sink!
- EXPECT_CALL(*mock_sink_, Start()).Times(2);
- EXPECT_CALL(*mock_sink_, Stop()).Times(2);
+ EXPECT_CALL(*mock_sink_.get(), Start()).Times(2);
+ EXPECT_CALL(*mock_sink_.get(), Stop()).Times(2);
media::AudioParameters params(
media::AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout, kSampleRate,
« no previous file with comments | « content/renderer/gpu/render_widget_compositor.cc ('k') | content/renderer/media/media_stream_center.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698