Clean up potentially leaky use of base::DeletePointer.

media/audio/virtual_audio_input_stream.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 "media/audio/virtual_audio_input_stream.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 32 matching lines @@
   }
 
   AudioConverter audio_converter_;
 
   DISALLOW_COPY_AND_ASSIGN(LoopbackAudioConverter);
 };
 
 VirtualAudioInputStream::VirtualAudioInputStream(
     const AudioParameters& params,
     const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner,
-    const AfterCloseCallback& after_close_cb)
+    bool delete_on_close)
     : worker_task_runner_(worker_task_runner),
-      after_close_cb_(after_close_cb),
+      delete_on_close_(delete_on_close),
       callback_(NULL),
       buffer_(new uint8[params.GetBytesPerBuffer()]),
       params_(params),
       mixer_(params_, params_, false),
       num_attached_output_streams_(0),
       fake_worker_(worker_task_runner_, params_),
       audio_bus_(AudioBus::Create(params)) {
   DCHECK(params_.IsValid());
   DCHECK(worker_task_runner_.get());
 
@@ skipping 79 matching lines @@
   // Because the audio is being looped-back, the delay since since it was
   // recorded is zero.
   callback_->OnData(this, audio_bus_.get(), 0, 1.0);
 }
 
 void VirtualAudioInputStream::Close() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   Stop();  // Make sure callback_ is no longer being used.
 
-  // If a non-null AfterCloseCallback was provided to the constructor, invoke it
-  // here.  The callback is moved to a stack-local first since |this| could be
-  // destroyed during Run().
-  if (!after_close_cb_.is_null()) {
-    const AfterCloseCallback cb = after_close_cb_;
-    after_close_cb_.Reset();
-    cb.Run(this);
+  if (delete_on_close_) {
+    delete this;
   }
 }
 
 double VirtualAudioInputStream::GetMaxVolume() {
   return 1.0;
 }
 
 void VirtualAudioInputStream::SetVolume(double volume) {}
 
 double VirtualAudioInputStream::GetVolume() {
   return 1.0;
 }
 
 bool VirtualAudioInputStream::SetAutomaticGainControl(bool enabled) {
   return false;
 }
 
 bool VirtualAudioInputStream::GetAutomaticGainControl() {
   return false;
 }
 
 bool VirtualAudioInputStream::IsMuted() {
   return false;
 }
 
 }  // namespace media