Clean up potentially leaky use of base::DeletePointer.

media/audio/virtual_audio_input_stream_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/rand_util.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 69 matching lines @@
   }
 
  private:
   base::WaitableEvent data_pulled_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAudioSource);
 };
 
 }  // namespace
 
+static void DeleteVirtualAudioOutputStream(
+    VirtualAudioOutputStream* audio_stream) {
+  delete audio_stream;
+}
+
 class VirtualAudioInputStreamTest : public testing::TestWithParam<bool> {
  public:
   VirtualAudioInputStreamTest()
       : audio_thread_(new base::Thread("AudioThread")),
         worker_thread_(new base::Thread("AudioWorkerThread")),
         stream_(NULL),
         closed_stream_(false, false) {
     audio_thread_->Start();
     audio_task_runner_ = audio_thread_->message_loop_proxy();
   }
 
   virtual ~VirtualAudioInputStreamTest() {
     SyncWithAudioThread();
 
     DCHECK(output_streams_.empty());
     DCHECK(stopped_output_streams_.empty());
   }
 
   void Create() {
     const bool worker_is_separate_thread = GetParam();
     stream_ = new VirtualAudioInputStream(
         kParams, GetWorkerTaskRunner(worker_is_separate_thread),
-        base::Bind(&base::DeletePointer<VirtualAudioInputStream>));
+        true);
     stream_->Open();
   }
 
   void Start() {
     EXPECT_CALL(input_callback_, OnData(_, NotNull(), _, _)).Times(AtLeast(1));
 
     ASSERT_TRUE(!!stream_);
     stream_->Start(&input_callback_);
   }
 
   void CreateAndStartOneOutputStream() {
     ASSERT_TRUE(!!stream_);
     AudioOutputStream* const output_stream = new VirtualAudioOutputStream(
         kParams,
         stream_,
-        base::Bind(&base::DeletePointer<VirtualAudioOutputStream>));
+        base::Bind(&DeleteVirtualAudioOutputStream));
     output_streams_.push_back(output_stream);
 
     output_stream->Open();
     output_stream->Start(&source_);
   }
 
   void Stop() {
     ASSERT_TRUE(!!stream_);
     stream_->Stop();
   }
@@ skipping 198 matching lines @@
   }
   RUN_ON_AUDIO_THREAD(Close);
   WaitUntilClosed();
 }
 
 INSTANTIATE_TEST_CASE_P(SingleVersusMultithreaded,
                         VirtualAudioInputStreamTest,
                         ::testing::Values(false, true));
 
 }  // namespace media