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

Unified Diff: content/renderer/media/webrtc_local_audio_track_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/media/webrtc_local_audio_track.cc ('k') | content/renderer/p2p/port_allocator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webrtc_local_audio_track_unittest.cc
diff --git a/content/renderer/media/webrtc_local_audio_track_unittest.cc b/content/renderer/media/webrtc_local_audio_track_unittest.cc
index 3d11faedbd173457066a1ca588cc9cb2a7fe4423..7f7c16dc1bc2686e22bcceae0fd6859cd6cda4a5 100644
--- a/content/renderer/media/webrtc_local_audio_track_unittest.cc
+++ b/content/renderer/media/webrtc_local_audio_track_unittest.cc
@@ -32,7 +32,7 @@ class FakeAudioThread : public base::PlatformThread::Delegate {
: capturer_(capturer),
thread_(),
closure_(false, false) {
- DCHECK(capturer);
+ DCHECK(capturer.get());
audio_bus_ = media::AudioBus::Create(capturer_->audio_parameters());
}
@@ -45,7 +45,8 @@ class FakeAudioThread : public base::PlatformThread::Delegate {
return;
media::AudioCapturerSource::CaptureCallback* callback =
- static_cast<media::AudioCapturerSource::CaptureCallback*>(capturer_);
+ static_cast<media::AudioCapturerSource::CaptureCallback*>(
+ capturer_.get());
audio_bus_->Zero();
callback->Capture(audio_bus_.get(), 0, 0);
@@ -108,14 +109,14 @@ class WebRtcLocalAudioTrackTest : public ::testing::Test {
virtual void SetUp() OVERRIDE {
capturer_ = WebRtcAudioCapturer::CreateCapturer();
capturer_source_ = new MockCapturerSource();
- EXPECT_CALL(*capturer_source_, Initialize(_, capturer_.get(), 0))
+ EXPECT_CALL(*capturer_source_.get(), Initialize(_, capturer_.get(), 0))
.WillOnce(Return());
capturer_->SetCapturerSource(capturer_source_,
media::CHANNEL_LAYOUT_STEREO,
48000);
- EXPECT_CALL(*capturer_source_, Start()).WillOnce(Return());
- EXPECT_CALL(*capturer_source_, SetAutomaticGainControl(false))
+ EXPECT_CALL(*capturer_source_.get(), Start()).WillOnce(Return());
+ EXPECT_CALL(*capturer_source_.get(), SetAutomaticGainControl(false))
.WillOnce(Return());
capturer_->Start();
audio_thread_.reset(new FakeAudioThread(capturer_));
@@ -125,7 +126,7 @@ class WebRtcLocalAudioTrackTest : public ::testing::Test {
virtual void TearDown() {
audio_thread_->Stop();
audio_thread_.reset();
- EXPECT_CALL(*capturer_source_, Stop()).WillOnce(Return());
+ EXPECT_CALL(*capturer_source_.get(), Stop()).WillOnce(Return());
capturer_->Stop();
}
« no previous file with comments | « content/renderer/media/webrtc_local_audio_track.cc ('k') | content/renderer/p2p/port_allocator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698