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

Unified Diff: media/audio/virtual_audio_output_stream_unittest.cc

Issue 1074963003: Clean up potentially leaky use of base::DeletePointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed another probleb Created 5 years, 8 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/audio/virtual_audio_input_stream_unittest.cc ('k') | media/cast/sender/video_encoder_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/virtual_audio_output_stream_unittest.cc
diff --git a/media/audio/virtual_audio_output_stream_unittest.cc b/media/audio/virtual_audio_output_stream_unittest.cc
index 72e794d6febdb4492c3c5b20ea0b0b358905212e..39a9106e43c3fc47d84e9bd5ab0552e481f6aef3 100644
--- a/media/audio/virtual_audio_output_stream_unittest.cc
+++ b/media/audio/virtual_audio_output_stream_unittest.cc
@@ -26,10 +26,7 @@ class MockVirtualAudioInputStream : public VirtualAudioInputStream {
public:
explicit MockVirtualAudioInputStream(
const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner)
- : VirtualAudioInputStream(
- kParams,
- worker_task_runner,
- base::Bind(&base::DeletePointer<VirtualAudioInputStream>)) {}
+ : VirtualAudioInputStream(kParams, worker_task_runner, true) {}
~MockVirtualAudioInputStream() {}
MOCK_METHOD2(AddOutputStream, void(VirtualAudioOutputStream* stream,
@@ -73,6 +70,11 @@ class VirtualAudioOutputStreamTest : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(VirtualAudioOutputStreamTest);
};
+static void DeleteVirtualAudioOutputStream(
+ VirtualAudioOutputStream* audio_stream) {
+ delete audio_stream;
+}
+
TEST_F(VirtualAudioOutputStreamTest, StartStopStartStop) {
static const int kCycles = 3;
@@ -86,7 +88,7 @@ TEST_F(VirtualAudioOutputStreamTest, StartStopStartStop) {
VirtualAudioOutputStream* const output_stream = new VirtualAudioOutputStream(
kParams,
input_stream,
- base::Bind(&base::DeletePointer<VirtualAudioOutputStream>));
+ base::Bind(&DeleteVirtualAudioOutputStream));
EXPECT_CALL(*input_stream, AddOutputStream(output_stream, _))
.Times(kCycles);
« no previous file with comments | « media/audio/virtual_audio_input_stream_unittest.cc ('k') | media/cast/sender/video_encoder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698