Clean up potentially leaky use of base::DeletePointer.

content/browser/media/capture/web_contents_audio_input_stream_unittest.cc

 // Copyright (c) 2013 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 "content/browser/media/capture/web_contents_audio_input_stream.h"
 
 #include <list>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 69 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(MockWebContentsTracker);
 };
 
 // A fully-functional VirtualAudioInputStream, but methods are mocked to allow
 // tests to check how/when they are invoked.
 class MockVirtualAudioInputStream : public VirtualAudioInputStream {
  public:
   explicit MockVirtualAudioInputStream(
       const scoped_refptr<base::MessageLoopProxy>& worker_loop)
-      : VirtualAudioInputStream(TestAudioParameters(), worker_loop,
-                                VirtualAudioInputStream::AfterCloseCallback()),
-        real_(TestAudioParameters(), worker_loop,
-              base::Bind(&MockVirtualAudioInputStream::OnRealStreamHasClosed,
-                         base::Unretained(this))),
+      : VirtualAudioInputStream(TestAudioParameters(), worker_loop, false),
+        real_(TestAudioParameters(), worker_loop, false),
         real_stream_is_closed_(false) {
     // Set default actions of mocked methods to delegate to the concrete
     // implementation.
     ON_CALL(*this, Open())
         .WillByDefault(Invoke(&real_, &VirtualAudioInputStream::Open));
     ON_CALL(*this, Start(_))
         .WillByDefault(Invoke(&real_, &VirtualAudioInputStream::Start));
     ON_CALL(*this, Stop())
         .WillByDefault(Invoke(&real_, &VirtualAudioInputStream::Stop));
     ON_CALL(*this, Close())
-        .WillByDefault(Invoke(&real_, &VirtualAudioInputStream::Close));
+        .WillByDefault(Invoke(this, &MockVirtualAudioInputStream::OnClose));
     ON_CALL(*this, GetMaxVolume())
         .WillByDefault(Invoke(&real_, &VirtualAudioInputStream::GetMaxVolume));
     ON_CALL(*this, SetVolume(_))
         .WillByDefault(Invoke(&real_, &VirtualAudioInputStream::SetVolume));
     ON_CALL(*this, GetVolume())
         .WillByDefault(Invoke(&real_, &VirtualAudioInputStream::GetVolume));
     ON_CALL(*this, SetAutomaticGainControl(_))
         .WillByDefault(
             Invoke(&real_, &VirtualAudioInputStream::SetAutomaticGainControl));
     ON_CALL(*this, GetAutomaticGainControl())
@@ skipping 19 matching lines @@
   MOCK_METHOD1(SetVolume, void(double));
   MOCK_METHOD0(GetVolume, double());
   MOCK_METHOD1(SetAutomaticGainControl, bool(bool));
   MOCK_METHOD0(GetAutomaticGainControl, bool());
   MOCK_METHOD2(AddOutputStream, void(VirtualAudioOutputStream*,
                                      const AudioParameters&));
   MOCK_METHOD2(RemoveOutputStream, void(VirtualAudioOutputStream*,
                                         const AudioParameters&));
 
  private:
-  void OnRealStreamHasClosed(VirtualAudioInputStream* stream) {
-    DCHECK_EQ(&real_, stream);
+  void OnClose() {
+    real_.Close();
     DCHECK(!real_stream_is_closed_);
     real_stream_is_closed_ = true;
   }
 
   VirtualAudioInputStream real_;
   bool real_stream_is_closed_;
 
   DISALLOW_COPY_AND_ASSIGN(MockVirtualAudioInputStream);
 };
 
@@ skipping 342 matching lines @@
   WaitForData();
   RUN_ON_AUDIO_THREAD(RemoveOneInputInFIFOOrder);
   WaitForData();
   RUN_ON_AUDIO_THREAD(ChangeMirroringTarget);
   RUN_ON_AUDIO_THREAD(RemoveOneInputInFIFOOrder);
   RUN_ON_AUDIO_THREAD(Stop);
   RUN_ON_AUDIO_THREAD(Close);
 }
 
 }  // namespace content